Merge remote-tracking branch 'origin/dev_1.1.0' into dev_1.1.0

sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -135,8 +135,12 @@ UPDATE sys_privilege
 SET name='编辑', url='Edit', `type`='LINK', parent_id=42, `sequence`=6, property='AUTH', related='3047,3048', enable=1, default_auth=0, front_display=1
 WHERE id=3039;
 UPDATE sys_privilege
-SET name='删除', url='Cancel', `type`='LINK', parent_id=42, `sequence`=7, property='AUTH', related='3045', enable=1, default_auth=0, front_display=1
+SET name='删除', url='Cancel', `type`='LINK', parent_id=42, `sequence`=7, property='AUTH', related='3088', enable=1, default_auth=0, front_display=1
 WHERE id=3040;
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(3090, '人员配置', 'Allocation', 'LINK', 42, 1, 'AUTH', '3045', 1, 0, 1);
+VALUES(3090, '人员配置', 'Allocation', 'LINK', 42, 1, 'AUTH', '3088', 1, 0, 1);
+
+UPDATE sys_privilege
+SET name='创建sop', url='CreateSop', `type`='LINK', parent_id=51, `sequence`=4, property='AUTH', related='3080,3081,3082,3083,3084,3085,3086,3087', enable=1, default_auth=0, front_display=1
+WHERE id=3079;

sop-business/src/main/resources/mapper/TBSopInfoMapper.xml

@@ -77,6 +77,7 @@
                IFNULL(art.NAME_,'--') as taskName,
                art.TASK_DEF_KEY_ as taskDefKey,
                tbcd.id as crmDetailId,
+               tbcd.course_name as courseName,
                (select group_concat(cast(art.ID_ as char)) from ACT_RU_TASK art where art.PROC_INST_ID_ = tffa.flow_id) as taskId
                 <if test="fieldName != null and fieldName != ''">
                     ,${fieldName}