Merge remote-tracking branch 'origin/V0.0.4' into V0.0.4

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysUser.java

@@ -19,6 +19,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -326,7 +327,16 @@ public class SysUser{
 
 
 
+    public Map<String, Object> getParams() {
+        if (params == null) {
+            params = new HashMap<>();
+        }
+        return params;
+    }
 
+    public void setParams(Map<String, Object> params) {
+        this.params = params;
+    }
 
 
     public boolean isAdmin() {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -2,6 +2,7 @@ package com.xunmei.core.evaluate.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -277,7 +278,10 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
             throw new RuntimeException("您没有该任务的评价权限");
         }
         List<Long> roleByEvaluateId = coreEvaluateRoleMapper.getRoleByEvaluateId(coreEvaluateTask.getPlanId());
-        Set<Long> rIds = new HashSet<>(roleByEvaluateId);
+        Set<Long> rIds = new HashSet<>();
+        if(ObjectUtil.isNotEmpty(roleByEvaluateId)){
+            rIds.addAll(roleByEvaluateId);
+        }
         List<SysRole> roleByUserId = remoteRoleService.getRoleByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER);
         List<Long> collect = roleByUserId.stream().map(SysRole::getId).collect(Collectors.toList());
         boolean admin = false;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/task/ResumptionTaskBusiness.java

@@ -160,7 +160,10 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
             return;
         }
         List<Long> hsOrgIds = getHangsheOrgIds();
-        Set<Long> sOrgIds = new HashSet<>(hsOrgIds);
+        Set<Long> sOrgIds = new HashSet<>();
+        if(ObjectUtil.isNotEmpty(hsOrgIds)){
+            sOrgIds.addAll(hsOrgIds);
+        }
         List<AppPlan> appPlans = new ArrayList<>();
         for (Object plan : plans) {
             if (plan.getClass() != AppPlan.class) {
@@ -509,13 +512,16 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
         }
 
         short realOrder = 0;
-        Set<Short> ex = new HashSet<>(executedOrders);
+        Set<Short> ex = new HashSet<>();
+        if(ObjectUtil.isNotEmpty(executedOrders)){
+            ex.addAll(executedOrders);
+        }
         for (Short i = 1; i <= count; i++) {
             if (!rangeMap.containsKey(i)) {
                 continue;
             }
             realOrder++;
-            if (ObjectUtil.isNotEmpty(executedOrders) && ex.contains(realOrder)) {
+            if (ex.contains(realOrder)) {
                 continue;
             }
 

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

@@ -242,7 +242,10 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
 
 //        execOrgs = execOrgs.stream().filter(o -> ObjectUtil.equal(o.getIsLock(), false)).collect(Collectors.toList());
         //此处循环所有执行检查的机构
-        Set<Integer> cts = new HashSet<>(checkOrgTypes);
+        Set<Integer> cts = new HashSet<>();
+        if(ObjectUtil.isNotEmpty(checkOrgTypes)){
+            cts.addAll(checkOrgTypes);
+        }
         for (SysOrg org : execOrgs) {
             List<SysOrg> checkOrgs = new ArrayList<>();
             if (ObjectUtil.isEmpty(checkOrg)) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRuleItemServiceImpl.java

@@ -101,7 +101,10 @@ public class SafetyCheckRuleItemServiceImpl
         final List<Long> pointIds = safetyCheckRulePointMapper.selectPointIds(item.getId());
         if (pointIds.size() > 0) {
             List<Long> idList2 = pointDtoList.stream().map(SafetyCheckRulePointDto::getId).collect(Collectors.toList());
-            Set<Long> ids2 = new HashSet<>(idList2);
+            Set<Long> ids2 = new HashSet<>();
+            if(ObjectUtil.isNotEmpty(idList2)){
+                ids2.addAll(idList2);
+            }
             for (Long pointId : pointIds) {
                 if (!ids2.contains(pointId)) {
                     Integer isUsed = safetyCheckRulePointMapper.checkIsUsed(pointId);

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

@@ -30,6 +30,7 @@ import com.xunmei.system.mapper.SysOrgMapper;
 import com.xunmei.system.mapper.SysRoleMapper;
 import com.xunmei.system.service.ISysDeptService;
 import com.xunmei.system.service.ISysOrgService;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -148,7 +149,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
      * @return
      */
     @Override
-    public List<SysOrgVO> selectTreeByOrgType(Boolean includeUp,Boolean includeBangshichu, OrgTypeEnum orgType) {
+    public List<SysOrgVO> selectTreeByOrgType(Boolean includeUp, Boolean includeBangshichu, OrgTypeEnum orgType) {
         String path = "";
         SysOrg sysOrg = getLoginUserOrg();
         path = sysOrg.getPath();
@@ -157,8 +158,8 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         }
 
         List<SysOrgVO> orglist = getWholePathInCache(includeUp, path, orgType);
-        if(!includeBangshichu){
-            orglist=orglist.stream().filter(o->ObjectUtil.notEqual(o.getType(),OrgTypeEnum.BAN_SHI_CHU.getCode()))
+        if (!includeBangshichu) {
+            orglist = orglist.stream().filter(o -> ObjectUtil.notEqual(o.getType(), OrgTypeEnum.BAN_SHI_CHU.getCode()))
                     .collect(Collectors.toList());
         }
         List<SysOrgVO> r = generateTree(orglist, sysOrg);
@@ -167,18 +168,19 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 
     /**
      * 获取本机构及下级机构，且上级机构若与本机构同类型，也获取
+     *
      * @return
      */
     @Override
-    public List<SysOrgVO> deptTreeWithSametypeUp(){
-        Map<Long,SysOrgVO> cacheList = getOrgCache().stream().collect(Collectors.toMap(SysOrgVO::getId,vo->vo));
-        Long orgId= SecurityUtils.getLoginUser().getOrgId();
-        if(!cacheList.containsKey(orgId)){
-            return  new ArrayList<>();
+    public List<SysOrgVO> deptTreeWithSametypeUp() {
+        Map<Long, SysOrgVO> cacheList = getOrgCache().stream().collect(Collectors.toMap(SysOrgVO::getId, vo -> vo));
+        Long orgId = SecurityUtils.getLoginUser().getOrgId();
+        if (!cacheList.containsKey(orgId)) {
+            return new ArrayList<>();
         }
 
-        SysOrgVO sysOrgVO =cacheList.get(orgId);
-        List<SysOrgVO> orgs=new ArrayList<>();
+        SysOrgVO sysOrgVO = cacheList.get(orgId);
+        List<SysOrgVO> orgs = new ArrayList<>();
         for (SysOrgVO org : cacheList.values()) {
             String path = org.getPath();
             if (StringUtils.isEmpty(path) || !path.startsWith(sysOrgVO.getPath())) {
@@ -194,12 +196,12 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
             orgs.add(org);
         }
 
-        SysOrgVO parentVo=cacheList.get(sysOrgVO.getParentId());
-        while(ObjectUtil.isNotNull(parentVo) && ObjectUtil.equal(parentVo.getType(), sysOrgVO.getType())){
+        SysOrgVO parentVo = cacheList.get(sysOrgVO.getParentId());
+        while (ObjectUtil.isNotNull(parentVo) && ObjectUtil.equal(parentVo.getType(), sysOrgVO.getType())) {
             orgs.add(parentVo);
-            sysOrgVO=parentVo;
+            sysOrgVO = parentVo;
 
-            parentVo=cacheList.get(sysOrgVO.getParentId());
+            parentVo = cacheList.get(sysOrgVO.getParentId());
         }
 
         SysOrg sysOrg = orgMapper.selectById(sysOrgVO.getId());
@@ -219,7 +221,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
                 excludeOrg = first.get();
             }
         }
-        if(excludeOrg == null){
+        if (excludeOrg == null) {
             return null;
         }
 
@@ -309,8 +311,8 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
      */
     @Override
     public List<SysOrgVO> hangsheWholePath(Long orgId) {
-        SysOrg org= orgService.getById(orgId);
-        List<SysOrgVO> orgs = getWholePathInCache(true,org.getPath(), OrgTypeEnum.HANG_SHE);
+        SysOrg org = orgService.getById(orgId);
+        List<SysOrgVO> orgs = getWholePathInCache(true, org.getPath(), OrgTypeEnum.HANG_SHE);
 
         return orgs;
     }
@@ -496,7 +498,11 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     public List<SysOrg> buildDeptTree(List<SysOrg> depts) {
         List<SysOrg> returnList = new ArrayList<SysOrg>();
         List<Long> tempList = depts.stream().map(SysOrg::getId).collect(Collectors.toList());
-        Set<Long> sts = new HashSet<>(tempList);
+
+        Set<Long> sts = new HashSet<>();
+        if (ObjectUtils.isNotEmpty(tempList)) {
+            sts.addAll(tempList);
+        }
         for (SysOrg dept : depts) {
             // 如果是顶级节点, 遍历该父节点的所有子节点
             if (!sts.contains(dept.getParentId())) {

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

@@ -200,7 +200,10 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     public List<SysMenu> buildMenuTree(List<SysMenu> menus) {
         List<SysMenu> returnList = new ArrayList<SysMenu>();
         List<Long> tempList = menus.stream().map(SysMenu::getId).collect(Collectors.toList());
-        Set<Long> sts = new HashSet<>(tempList);
+        Set<Long> sts = new HashSet<>();
+        if(ObjectUtil.isNotEmpty(tempList)){
+            sts.addAll(tempList);
+        }
         for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext(); ) {
             SysMenu menu = (SysMenu) iterator.next();
             // 如果是顶级节点, 遍历该父节点的所有子节点