Merge remote-tracking branch 'origin/master'

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/strategy/serviceimpl/MachineryTicketProcessServiceImpl.java

@@ -45,7 +45,7 @@ public class MachineryTicketProcessServiceImpl extends ProcessAbstractService {
 	@Override
 	public Boolean isWorkflowProcess(WorkflowQueue flowQueue) {
 		log.info("是否执行水力机械工作票流程环节操作~~~~,流程ticket: {}", flowQueue);
-		String dictValue = processDictService.selectDictValueByKey(flowQueue.getProcessDefinitionKey());
+		String dictValue = processDictService.selectDictValueByKey(MACHINERY_TICKET_KEY);
 		if (dictValue.equals(flowQueue.getProcessDefinitionKey())) {
 			log.info("已执行水力机械工作票流程环节操作~~~~");
 			return true;

hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AlarmHandleServiceImpl.java

@@ -154,7 +154,7 @@ public class AlarmHandleServiceImpl extends BaseServiceImpl<AlarmHandleMapper, A
 	public List<AlarmHandleEntity> handles(List<Long> types,Integer isEarly) {
 		if(AbnormalAlarmConstant.INTELLIGENCE_ALARM.equals(isEarly)){
 			String end = DateUtil.format(new Date(),DateUtil.PATTERN_DATETIME);
-			return this.baseMapper.handles(types,null,null);
+			return this.baseMapper.handles(types,null,end);
 		}
 		String start = DateUtil.format(new Date(),DateUtil.PATTERN_DATE) + " 00:00:00";
 		String end = DateUtil.format(new Date(),DateUtil.PATTERN_DATETIME);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java

@@ -230,10 +230,13 @@ public class MainWorkBenchServiceImpl extends BaseServiceImpl<MainWorkBenchMappe
 			workBench.setMainWorkBenchEntityList(routes);
 		}else if(CollectionUtil.isEmpty(routes.stream().filter(o->StringUtils.isNotEmpty(o.getRefDept())).collect(Collectors.toList()))){
 			// 设置结果集
-			workBench.setMainWorkBenchEntityList(routes.stream().filter(o->o.getAscriptionUser().contains(user)).collect(Collectors.toList()));
+			workBench.setMainWorkBenchEntityList(routes.stream().filter(o->StringUtils.isNotEmpty(o.getAscriptionUser()) && o.getAscriptionUser().contains(user)).collect(Collectors.toList()));
 		}else{
 			// 设置结果集
 			workBench.setMainWorkBenchEntityList(routes.stream().filter(o->{
+				if(StringUtils.isEmpty(o.getRefDept())){
+					return false;
+				}
 				for(String deptId: depts) {
 					if (o.getRefDept().contains(deptId)) {
 						return true;