提交冲突代码

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/EmergencyTaskMapper.java

@@ -20,4 +20,6 @@ public interface EmergencyTaskMapper extends BaseMapper {
 
     List<Long> getPersonIds(Long obligationId);
 
+    List<String> roleNames(String amosOrgId);
+
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EmergencyTaskServiceImpl.java

@@ -53,6 +53,13 @@ public class EmergencyTaskServiceImpl implements IEmergencyTaskService {
     }
 
     @Override
+    public String getRolesNameByUserId(String userId) {
+        List<String> list = emergencyTaskMapper.roleNames(userId);
+        String roleNames = String.join(",", list);
+        return roleNames;
+    }
+
+    @Override
     public List<Long> getPersonIds(Long obligationId) {
         return emergencyTaskMapper.getPersonIds(obligationId);
     }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IEmergencyTaskService.java

@@ -23,4 +23,6 @@ public interface IEmergencyTaskService  {
 
    List<Long> getPersonIds(Long obligationId);
 
+   String getRolesNameByUserId(String userId);
+
 }

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

@@ -59,6 +59,18 @@
         </where>
     </select>
 
+    <select id="roleNames" resultType="string">
+    SELECT
+    f.dict_name AS dictName
+    FROM
+    c_emergency_relation cer LEFT JOIN  f_dict f ON cer.obligationId = f.id
+    <where>
+        <if test="_parameter != null  ">
+            cer.amos_id = #{amosOrgId}
+        </if>
+    </where>
+    </select>
+
     <select id="getPersonIds" resultType="long">
         SELECT
         cer.person_id AS persons