修改安全檢測報告中的問題

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/registerbook/controller/CoreRegisterBookPdfController.java

@@ -60,7 +60,7 @@ public class CoreRegisterBookPdfController extends BaseController {
     public void exportPdfZip(@RequestBody CoreRegisterBookPdfExportDto exportDto, HttpServletResponse response) throws IOException {
         final String orgName = orgService.selectOrgById(exportDto.getOrgId(), SecurityConstants.INNER).getName();
         final List<CoreRegisterBookPdfPageVo> registerBookPdfList = registerBookPdfService.queryExportData(exportDto);
-        if (registerBookPdfList.size() == 0) {
+        if (registerBookPdfList.isEmpty()) {
             throw new RuntimeException("暂无可用数据导出");
         }
         String fileName = exportDto.getIsRegisterBookPage() ? orgName + "_登记簿_" : orgName + "_数据报表_";

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/TaskController.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.resumption.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -385,7 +386,7 @@ public class TaskController {
     private List<Long> getOrgIdsByPlanIds(AppPlan plan, List<Long> orgIds, List<Long> workOrgIds) {
         //获取计划关联的机构
         List<Long> orgIdsByPlans = getPlanOrgIds(plan);
-        if (orgIdsByPlans.size() == 0) {
+        if (CollectionUtil.isEmpty(orgIdsByPlans)) {
             throw new RuntimeException("计划未关联机构");
         }
         //去掉传过来的机构id中不在计划关联机构中的数据,,得到要生成任务的机构id
@@ -414,7 +415,7 @@ public class TaskController {
         } else {
             appPlans = appPlanService.list((new QueryWrapper<AppPlan>()).lambda().eq(AppPlan::getPlanStatus, "1"));
         }
-        if (appPlans.size() == 0) {
+        if (appPlans.isEmpty()) {
             throw new RuntimeException("没有可用的计划");
         }
         return appPlans;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/ResumptionBusiness.java

@@ -474,7 +474,7 @@ public class ResumptionBusiness {
         Map<Long, List<ResumptionPointVo>> pointListMap = pointList.stream().collect(Collectors.groupingBy(r -> r.getAreaid()));
         for (Long key : pointListMap.keySet()) {
             List<ResumptionPointVo> pointsList = pointListMap.get(key);
-            if (pointsList == null || pointsList.size() == 0) {
+            if (CollectionUtil.isEmpty(pointsList)) {
                 continue;
             }
 
@@ -485,7 +485,7 @@ public class ResumptionBusiness {
 
             List<ResumptionNfcVo> areanfclist = nfclist.stream().filter(r -> r.getAreaId().equals(key)).collect(Collectors.toList());
             if ("0".equals(0)) {
-                if (areanfclist == null || areanfclist.size() == 0) {
+                if (CollectionUtil.isEmpty(areanfclist)) {
                     continue;
                 }
             }
@@ -495,7 +495,7 @@ public class ResumptionBusiness {
             List<ResumptionRegisterItemVo> checklist = new ArrayList<>();
             for (Long keya : pointsListMapItem.keySet()) {
                 List<ResumptionPointVo> checkitemlist = pointsListMapItem.get(keya);
-                if (checkitemlist == null || checkitemlist.size() == 0) {
+                if (CollectionUtil.isEmpty(checkitemlist)) {
                     continue;
                 } else {
                     for (ResumptionPointVo r :

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.resumption.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -375,7 +376,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             }
 
             List<RuleItemVo> itemList = app.getItemList();
-            if (itemList.size() == 0) {
+            if (CollectionUtil.isEmpty(itemList)) {
                 throw new RuntimeException("请选择履职要点");
             }
 
@@ -446,7 +447,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                         .filter(e -> e.getOfOrgId().equals(app.getPlanCreateOrgId()))
                         .collect(Collectors.toList());
 
-                if (valitemList.size() == 0) {
+                if (CollectionUtil.isEmpty(valitemList)) {
                     throw new RuntimeException("请选择履职要点");
                 }
                 AppPlanToPoint item = null;
@@ -508,7 +509,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             List<RuleItemVo> valitemList = app.getItemList();
             List<RuleItemVo> itemList = valitemList.stream().filter(e -> e.getOfOrgId().equals(app.getPlanCreateOrgId())).collect(Collectors.toList());
 
-            if (valitemList.size() == 0) {
+            if (CollectionUtil.isEmpty(valitemList)) {
                 throw new RuntimeException("请选择履职要点");
             }
             AppPlanToPoint item = null;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/ResumptionRecordServiceImpl.java

@@ -356,7 +356,7 @@ public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMap
         pageDto.setPageNum(1L);
         pageDto.setPageSize(10001L);
         final List<ResumptionRecordPageVo> data = this.selectList(pageDto).getRows();
-        if (data.size() == 0) {
+        if (CollectionUtil.isEmpty(data)) {
             throw new ServiceException("暂无可用数据导出!");
         }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/job/SafetyCheckJobBusiness.java

@@ -767,7 +767,7 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
                 //拿到唯一行社
                 SysOrg ofhs = null;
                 Integer ofType = 0;
-                if (orgs1.size() > 0) {
+                if (CollectionUtil.isNotEmpty(orgs1)) {
                     ofhs = orgs1.get(0);
                     ofType = ofhs.getType();
                     //拿到当前周期所有检查计划
@@ -811,7 +811,7 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
                         //选择了具体执行检查的机构
                         execOrgs = plan.getExecOrgList();
                         //如果不存在具体的执行检查的机构就是指定类型,直接拿所属行社
-                        if (execOrgs.size() == 0) {
+                        if (CollectionUtil.isEmpty(execOrgs)) {
                             execOrgs.add(ofhs);
                         }
                         //此处循环所有执行检查的机构
@@ -820,7 +820,7 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
                             //选择了具体的受检机构
                             checkOrgs = plan.getCheckOrgList();
                             //如果不存在具体的受检机构就是指定类型,直接拿作息变更的机构
-                            if (checkOrgs.size() == 0) {
+                            if (CollectionUtil.isEmpty(checkOrgs)) {
                                 checkOrgs.add(worg);
                             }
                             //构建数据

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyindex/service/impl/CoreSafetyExceptionDataServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.safetyindex.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
@@ -621,7 +622,7 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
 
     public static List<Map<Integer, List<String>>> groupContinuousDays(List<String> days) {
         List<Map<Integer, List<String>>> result = new ArrayList<>();
-        if (days == null || days.size() == 0) {
+        if (CollectionUtil.isEmpty(days)) {
             return result;
         }
         List<String> list = new ArrayList<>();
@@ -637,7 +638,7 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
                     list.add(days.get(i));
                 }
             } else {
-                if (list.size() > 0) {
+                if (!list.isEmpty()) {
                     map.put(list.size(), new ArrayList<>(list));
                     result.add(map);
                     list.clear();

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/service/LocalSysFileServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xunmei.file.service;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -805,7 +806,7 @@ public class LocalSysFileServiceImpl implements ISysFileService {
     private List<List<CoreRegisterBookPdfPageVo>> checkSubList(CoreRegisterBookPdfExportDto pdfDto) {
         List<List<CoreRegisterBookPdfPageVo>> list = new ArrayList<>();
         List<CoreRegisterBookPdfPageVo> registerBookPdfList = pdfDto.getDataList();
-        if (registerBookPdfList == null || registerBookPdfList.size() == 0) {
+        if (CollectionUtil.isEmpty(registerBookPdfList)) {
             throw new RuntimeException("暂无可下载数据！");
         }
         //小于3000条直接导出

soc-modules/soc-modules-sync/src/main/java/com/xunmei/sync/service/impl/FJNXSyncServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xunmei.sync.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.xunmei.common.core.constant.SecurityConstants;
@@ -328,7 +329,7 @@ public class FJNXSyncServiceImpl implements IFJNXSyncService {
     public void resetChildOrgPath(SysOrg parentOrg,List<SysOrg> orgList)
     {
         List<SysOrg> childOrgList = orgList.stream().filter(childOrg ->ObjectUtil.equal(childOrg.getParentId(),parentOrg.getId())).collect(Collectors.toList());
-        if(childOrgList.size()==0) {
+        if(CollectionUtil.isEmpty(childOrgList)) {
             return;
         }
         childOrgList.stream().forEach(org->{
@@ -350,7 +351,7 @@ public class FJNXSyncServiceImpl implements IFJNXSyncService {
     public void resetChildOrgTreePath(SysOrg parentOrg,List<SysOrg> orgList)
     {
         List<SysOrg> childOrgList = orgList.stream().filter(childOrg ->ObjectUtil.equal(childOrg.getTreeShowParentId(),parentOrg.getId())).collect(Collectors.toList());
-        if(childOrgList.size()==0) {
+        if(CollectionUtil.isEmpty(childOrgList)) {
             return;
         }
         childOrgList.stream().forEach(org->{
@@ -1151,7 +1152,7 @@ public class FJNXSyncServiceImpl implements IFJNXSyncService {
             return;
         }
         List<FjnxOrg> childOrgList = list.stream().filter(x -> parentOrg.getOrgCode().equals(x.getOrgParent())).collect(Collectors.toList());
-        if (childOrgList.size() == 0) {
+        if (CollectionUtil.isEmpty(childOrgList)) {
             return;
         }
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysDeptServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xunmei.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -408,7 +409,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 
         // 顶级机构存在多个的情况
         List<Long> parentIds = orgs.stream().filter(x -> !orgs.stream().anyMatch(y -> x.getTreeShowParentId().equals(y.getId()))).map(SysOrgVO::getTreeShowParentId).collect(Collectors.toList());
-        if (parentIds.size() == 0) {
+        if (CollectionUtil.isEmpty(parentIds)) {
             parentIds.add(parentId);
         } else {
             parentIds = parentIds.stream().distinct().collect(Collectors.toList());

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xunmei.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -586,7 +587,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
-        if (StringUtils.isNull(userList) || userList.size() == 0) {
+        if (CollectionUtil.isEmpty(userList)) {
             throw new ServiceException("导入用户数据不能为空！");
         }
         int successNum = 0;