Merge remote-tracking branch 'origin/dev' into dev

RMS/pom.xml

@@ -164,7 +164,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

RMS/src/main/java/cn/cslg/report/common/model/vo/PersonnelVO.java

@@ -132,6 +132,10 @@ public class PersonnelVO extends BaseVO {
      */
     private List<Integer> notInPersonIds;
     /**
+     * 租户类型
+     */
+    private String tenantType;
+    /**
      * 部门职位绑定关系
      */
     @Data

RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -122,7 +122,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         Integer id = loginUtils.getId();
         List<Integer> departIds = outInterfaceService.getDutyDepartsFromPCS(id);
         LambdaQueryWrapper<Report> queryWrapper = new LambdaQueryWrapper<>();
-          queryWrapper.ne(Report::getId,0);
+        queryWrapper.ne(Report::getId, 0);
         if (reportVO.getName() != null) {
             queryWrapper.like(Report::getName, reportVO.getName());
         }
@@ -139,7 +139,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
             List<Report> reports = this.page(new Page<>(reportVO.getCurrent(), reportVO.getSize()), queryWrapper).getRecords();
             reports = this.reportData(reports);
             SecurityUtils.startDataScope("/pcs/report/query");
-            Long  count = this.count(queryWrapper);
+            Long count = this.count(queryWrapper);
             return Response.success(reports, DataUtils.setPageColumn(reportVO.getSize(), reportVO.getCurrent(), Math.toIntExact(count)));
         } else {
             SecurityUtils.startDataScope("/pcs/report/query");
@@ -211,6 +211,9 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
             if (mapDeaprt.size() != 0) {
                 item.setDepartmentName(mapDeaprt.get(0).get("departName").toString());
             }
+            if (item.getClientId() == null) {
+                item.setClientId(0);
+            }
             //装载客户
             List<Map<String, Object>> mapClient = mapClients.stream().filter(tem -> tem.get("clientId").toString().equals(item.getClientId().toString())).collect(Collectors.toList());
             if (mapClient.size() != 0) {