Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud

pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/AppVisitorController.java

@@ -324,10 +324,20 @@ public class AppVisitorController {
 
 
     @GetMapping("/getBFInfo")
-    @SysLog("查询拜访人的信息" )
+    @SysLog("查询拜访人的信息")
     @Operation(summary = "查询拜访人的信息" , description = "根据拜访人的手机号或者姓名精确查询" )
     public R getBFInfo(@RequestParam("keyword") String keyword) {
         R<List<UserDeptSimpleInfo>> userByNameOrMobile = remoteUserService.getUserByNameOrMobile(keyword);
+        // 对手机号进行脱敏处理
+        if (userByNameOrMobile != null && userByNameOrMobile.getData() != null) {
+            userByNameOrMobile.getData().forEach(user -> {
+                if (user.getMobile() != null && user.getMobile().length() == 11) {
+                    String mobile = user.getMobile();
+                    String maskedMobile = mobile.substring(0, 3) + "****" + mobile.substring(7);
+                    user.setMobile(maskedMobile);
+                }
+            });
+        }
         return userByNameOrMobile;
     }
 

pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java

@@ -65,6 +65,7 @@ public class FeedbackController {
 		wrapper.like(StrUtil.isNotBlank(feedback.getTitle()),FeedbackEntity::getTitle,feedback.getTitle());
 		wrapper.eq(StrUtil.isNotBlank(feedback.getStatus()),FeedbackEntity::getStatus,feedback.getStatus());
 		wrapper.eq(StrUtil.isNotBlank(feedback.getType()),FeedbackEntity::getType,feedback.getType());
+        wrapper.orderByDesc(FeedbackEntity::getCreateTime).orderByDesc(FeedbackEntity::getStatus);
         return R.ok(feedbackService.page(page, wrapper));
     }
 
@@ -194,7 +195,7 @@ public class FeedbackController {
         
         List<FeedbackTypeVO> voList = dictResult.getData().stream().map(item -> {
             FeedbackTypeVO vo = new FeedbackTypeVO();
-            vo.setId(item.getId());
+            vo.setId(item.getItemValue());
             vo.setLabel(item.getLabel());
             return vo;
         }).collect(Collectors.toList());

pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MaintenanceOrderController.java

@@ -226,7 +226,7 @@ public class MaintenanceOrderController {
         
         List<MaintenanceTypeVO> voList = dictResult.getData().stream().map(item -> {
             MaintenanceTypeVO vo = new MaintenanceTypeVO();
-            vo.setId(item.getId());
+            vo.setId(item.getItemValue());
             vo.setLabel(item.getLabel());
             return vo;
         }).collect(Collectors.toList());

pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java

@@ -67,7 +67,7 @@ public class VisitorsController {
      */
     @Operation(summary = "通过id查询" , description = "通过id查询" )
     @GetMapping("/{id}" )
-    @PreAuthorize("@pms.hasPermission('integrated_visitors_view')" )
+//    @PreAuthorize("@pms.hasPermission('integrated_visitors_view')" )
     public R getById(@PathVariable("id" ) Long id) {
         return R.ok(visitorsService.getById(id));
     }

pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingRoomServiceImpl.java

@@ -205,12 +205,22 @@ public class MeetingRoomServiceImpl extends ServiceImpl<MeetingRoomMapper, Meeti
         queryWrapper.in(MeetingRoomEquipmentEntity::getRoomId, roomIds);
         List<MeetingRoomEquipmentEntity> equipmentList = meetingRoomEquipmentMapper.selectList(queryWrapper);
 
+        // 如果没有任何设备关联记录，直接返回空Map
+        if (CollectionUtils.isEmpty(equipmentList)) {
+            return Collections.emptyMap();
+        }
+
         // 2. 查询设备详细信息
         List<Long> equipIds = equipmentList.stream()
                 .map(MeetingRoomEquipmentEntity::getEquipId)
                 .distinct()
                 .collect(Collectors.toList());
 
+        // 如果设备ID列表为空，也直接返回空Map
+        if (CollectionUtils.isEmpty(equipIds)) {
+            return Collections.emptyMap();
+        }
+
         Map<Long, MeetingEquipmentEntity> equipmentInfoMap = meetingEquipmentMapper.selectBatchIds(equipIds)
                 .stream()
                 .collect(Collectors.toMap(MeetingEquipmentEntity::getId, e -> e));

pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/FeedbackTypeVO.java

@@ -21,7 +21,7 @@ public class FeedbackTypeVO implements Serializable {
      * 字典项ID
      */
     @Schema(description = "字典项ID")
-    private Long id;
+    private String id;
 
     /**
      * 标签名称

pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/MaintenanceTypeVO.java

@@ -21,7 +21,7 @@ public class MaintenanceTypeVO implements Serializable {
      * 字典项ID
      */
     @Schema(description = "字典项ID")
-    private Long id;
+    private String id;
 
     /**
      * 标签名称