子任务配置BUG修改

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/ContingencyInstanceInfoMapper.xml

@@ -346,10 +346,10 @@
         select  cpi.id, cpi.`record_type`, cpi.`category`, cpi.`content`, cpi.`icon`, cpi.`sort`, cpi.`sequence_num`
         , cpi.`batch_no`, cpi.`create_date`, cpi.`create_user`, cpi.`update_date`
         , cpi.`update_user`, cpi.`is_delete`, cpi.`tips`, IFNULL(cpi.`runstate`, 0) AS runstate, cpi.`file_path`
-        , `file_type`, `role_name`, `role_code`, `start_user_name`
+        , `file_type`, `role_code`, ro.name AS role_name,  `start_user_name`
         , cpi.`start_user_id`, cpi.`person_img`,cii.name
         from  contingency_plan_instance cpi left  join  contingency_instance_info  cii
-        on cpi.batch_no = cii.id
+        on cpi.batch_no = cii.id left  join c_emergency_task_role ro on ro.`code` = cpi.role_code
         <where>
             cpi.step_code != "-1"
             <if test="batchNo != null and batchNo != ''">

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/EmergencyTaskRoleMapper.xml

@@ -41,9 +41,8 @@
     </select>
 
     <delete id="deleteById">
-        UPDATE
+        delete from
             c_emergency_task_role
-        SET `is_delete` = 1
         WHERE
             `id` = #{id}
     </delete>