解决冲突

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserEmpowerInterceptor.java

@@ -169,7 +169,7 @@ public class UserEmpowerInterceptor implements Interceptor {
                     Boolean specific= userEmpower.specific();
                     //获取参数值，
                     StdUserEmpower dataAuthRule =(StdUserEmpower) redisUtils.get("Emp_"+RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
-                    String[] data = new String[]{String.join(",",dataAuthRule.getAmosOrgCode()),dataAuthRule.getAdminRegionalCompaniesCode(),dataAuthRule.getUserId(),dataAuthRule.getRegionalCompaniesCode()};
+                    String[] data = new String[]{String.join(",",dataAuthRule.getAmosOrgCode()),dataAuthRule.getAdminRegionalCompaniesCode() == null? dataAuthRule.getRegionalCompaniesCode():dataAuthRule.getAdminRegionalCompaniesCode(),dataAuthRule.getUserId(),dataAuthRule.getRegionalCompaniesCode()};
                     List<String> list = new ArrayList<>(Arrays.asList(data));
                     list.removeAll(Collections.singleton(null));
 
@@ -179,7 +179,7 @@ public class UserEmpowerInterceptor implements Interceptor {
                     if (!ValidationUtil.isEmpty(dataAuthRule.getAdminRegionalCompaniesCode())  && fileds.size() >1) {
                         sq = selectSqlJXS(new String[]{fileds.get(0), fileds.get(1)}, fileCondition, list);
                     } else if (!ValidationUtil.isEmpty(dataAuthRule.getUserId())) {
-                        sq = selectSqlJXS(new String[]{fileds.get(0),fileds.size()<3?fileds.get(0):fileds.get(2)},new String[]{fileCondition[0],fileCondition[2]} , list);
+                        sq = selectSqlJXS(new String[]{fileds.get(0),fileds.get(1),fileds.size()<3?fileds.get(0):fileds.get(2)},new String[]{fileCondition[0],fileCondition[1],fileCondition[2]} , list);
                     } else {
                         sq = selectSqlJXS(new String[]{fileds.get(0)}, fileCondition, specific?list:Arrays.asList(list.get(1)));
                     }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/MaintenanceServiceImpl.java

@@ -266,10 +266,12 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
         maintenanceDto.setIdCardFrontList(maintenanceDto.getIdCardFront()!=null?JSONArray.parseArray(maintenanceDto.getIdCardFront()):null);
         maintenanceDto.setIdCardOppositeList(maintenanceDto.getIdCardFront()!=null?JSONArray.parseArray(maintenanceDto.getIdCardOpposite()):null);
 
-        MaintenanceLog maintenanceLog = maintenanceLogMapper.selectOne(new QueryWrapper<MaintenanceLog>().lambda().eq(MaintenanceLog::getMaintenanceId, sequenceNbr));
-        maintenanceDto.setNotes(maintenanceLog.getNotes());
-        maintenanceDto.setOperator(maintenanceLog.getOperator());
-        maintenanceDto.setOperationTime(maintenanceLog.getOperationTime());
+        if (!maintenanceDto.getReviewStatus().equals("审核中")){
+            MaintenanceLog maintenanceLog = maintenanceLogMapper.selectOne(new QueryWrapper<MaintenanceLog>().lambda().eq(MaintenanceLog::getMaintenanceId, sequenceNbr));
+            maintenanceDto.setNotes(maintenanceLog.getNotes());
+            maintenanceDto.setOperator(maintenanceLog.getOperator());
+            maintenanceDto.setOperationTime(maintenanceLog.getOperationTime());
+        }
 
         //获取文档
       List<MaintenanceFile>   list=  maintenanceFileMapper.selectList(