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

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java

@@ -12,6 +12,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
 import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan;
 import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
+import cn.estsh.impp.framework.boot.util.ImppLog;
 import com.alibaba.fastjson.JSON;
 import com.rabbitmq.client.Channel;
 import org.slf4j.Logger;
@@ -48,6 +49,9 @@ public class ScheduleQueueReceiver {
     @Autowired
     private RabbitTemplate rabbitTemplate;
 
+    @Autowired
+    private ImppLog imppLog;
+
     /**
      * 定时任务通道处理
      *
@@ -76,7 +80,7 @@ public class ScheduleQueueReceiver {
                     logTaskTime.setTaskCycleNameRdd(taskPlan.getTaskCycleNameRdd());
                     logTaskTime.setTaskCycleExpsRdd(taskPlan.getTaskCycleExpsRdd());
                     ConvertBean.serviceModelInitialize(logTaskTime, "system");
-                    sysTaskPlanService.logInsertSysLogTaskTime(logTaskTime);
+                    imppLog.insertSysLogTaskTime(logTaskTime);
 
                     // 定时任务失败通知
                     if (CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() == logTaskTime.getTaskStatus()

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java

@@ -193,8 +193,13 @@ public class PersonnelServiceService implements IPersonnelService {
     @Override
     public ListPager<SysUser> querySysUser(UserDetailModel model, Pager pager) {
         Set<Long> idList = new HashSet<>();
-        idList.addAll(findSysUserIdByDepartmentId(model.getSysUser().getDepartmentId()));
-        idList.addAll(findSysUserIdByOrganizeCode(model.getSysUser().getOrganizeCode()));
+        if(model.getSysUser() != null && model.getSysUser().getDepartmentId() != null){
+            idList.addAll(findSysUserIdByDepartmentId(model.getSysUser().getDepartmentId()));
+        }
+        if(model.getSysUser() != null && model.getSysUser().getOrganizeCode() != null){
+            idList.addAll(findSysUserIdByOrganizeCode(model.getSysUser().getOrganizeCode()));
+        }
+
         if(model.getUserIdList() != null){
             model.getUserIdList().forEach(idStr -> idList.add(Long.parseLong(idStr)));
         }