处理作息触发任务生成（履职、安全检查）、网点责任人授权的while(true)

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/TaskCreatingServiceImplBase.java

@@ -345,17 +345,16 @@ public abstract class TaskCreatingServiceImplBase<M extends BaseMapper<T>, T> ex
         if (start.after(end)) {
             return false;
         }
-        Set<Long> timeValues = workTimes.stream().map(t -> t.getYmdDate().getTime()).collect(Collectors.toSet());
-        while (true) {
+        Set<Long> timeValues = workTimes.stream().map(t ->DateUtil.beginOfDay(t.getYmdDate()).getTime()).collect(Collectors.toSet());
+        for (;!start.after(end);){
             if (timeValues.contains(DateUtil.beginOfDay(start).getTime())) {
                 return true;
             }
 
             start = DateUtil.offset(start, DateField.DAY_OF_YEAR, 1);
-            if (start.equals(end) || start.after(end)) {
-                return false;
-            }
         }
+
+        return false;
     }
 
 //    /**

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

@@ -193,17 +193,15 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
             }
             orgs.add(org);
         }
-        while(true){
-            if(!cacheList.containsKey(sysOrgVO.getParentId())){
-                break;
-            }
-            SysOrgVO parentVo=cacheList.get(sysOrgVO.getParentId());
-            if(ObjectUtil.notEqual(parentVo.getType(), sysOrgVO.getType()) ){
-                break;
-            }
+
+        SysOrgVO parentVo=cacheList.get(sysOrgVO.getParentId());
+        while(ObjectUtil.isNotNull(parentVo) && ObjectUtil.equal(parentVo.getType(), sysOrgVO.getType())){
             orgs.add(parentVo);
             sysOrgVO=parentVo;
+
+            parentVo=cacheList.get(sysOrgVO.getParentId());
         }
+
         SysOrg sysOrg = orgMapper.selectById(sysOrgVO.getId());
         return generateTree(orgs, sysOrg);
     }