From 38d5bc10da83442e3d71d74f9f3f051771dcf00a Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 31 Dec 2019 15:13:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=9F=A5=E8=AF=A2=20Bug?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/busi/PersonnelServiceService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index fe89361..50061bd 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/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 querySysUser(UserDetailModel model, Pager pager) { Set 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))); } From b61b59ff761ebec8741ec011ca69e0f4b51248b7 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 3 Jan 2020 14:17:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java index 3343ed7..853dd1f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java +++ b/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()