Ver código fonte

2022-09-1 报警责任人显示问题,如果不是系统消息,显示空

zhuchangxue 3 anos atrás
pai
commit
ccb996ae81

+ 2 - 1
docker/mysql/update/lab-update.sql

@@ -1 +1,2 @@
-ALTER TABLE lab_hardware ADD manufacturer_type TINYINT(4) COMMENT '供应厂商';
+ALTER TABLE lab_hardware ADD manufacturer_type TINYINT(4) COMMENT '供应厂商';
+ALTER TABLE lab_notifyplan ADD execution_time datetime COMMENT '执行时间';

+ 1 - 1
zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpAlarmRecordMapper.xml

@@ -71,7 +71,7 @@
         alarmDeptName,
         (SELECT st.name FROM lab_subject st WHERE st.id = ard.`sub_id`) subName,
         CASE WHEN ard.alarm_mode = 1 THEN (SELECT GROUP_CONCAT(nick_name,' ',phonenumber SEPARATOR '、') FROM sys_user WHERE FIND_IN_SET(user_id, ard.liable_user_ids))
-        ELSE ard.liable_user_ids
+        ELSE ''
         END liableUserName,
         ard.handling_time handlingTime,
         (SELECT ur.nick_name FROM sys_user ur WHERE ur.user_id = ard.handling_user_id) handlingUserName,