bug修复

2024-04-07 11:10:35 +08:00
parent 9537faea90
commit 666090fbe3
21 changed files with 311 additions and 118 deletions
@@ -39,8 +39,13 @@
    group by a.case_appli_id
  </select>
    <select id="selectByCaseId" resultType="com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAffiliate">
-        select c.id caseAppliId,a.id,a.role_type roleType,a.group_order groupOrder,a.operator_flag operatorFlag,d.code,d.comp_legal_person compLegalPerson,u.nick_name name,u.id_card idCard,u.phonenumber phone,
-            u.email,u.home,u.address,u.sex,u.nationality,u.id_type idType,u.birth,a.user_id userId
+        select c.id caseAppliId,a.id,a.role_type roleType,a.group_order groupOrder,a.operator_flag operatorFlag,d.code,d.comp_legal_person compLegalPerson,u.id_card idCard,u.phonenumber phone,
+            u.email,
+               (case when a.user_id is null then d.dept_name else u.nick_name end)  name,
+               (case when a.user_id is null then d.home else u.home end) home,
+               (case when a.user_id is null then d.address else u.address end) address,
+               (case when a.user_id is null then d.nationality else u.nationality end) nationality,
+                u.sex,u.id_type idType,u.birth,a.user_id userId,c.organize_flag organizeFlag,c.case_source caseSource,d.dept_name applicantOrgName
        FROM
            ms_case_application c
                JOIN ms_case_affiliate a ON a.case_appli_id=#{id} and c.id = a.case_appli_id
@@ -52,8 +57,13 @@
        GROUP BY a.id
    </select>
    <select id="selectUserRoleByCaseIds" resultType="com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAffiliate">
-        select c.id caseAppliId,a.id,a.role_type roleType,a.group_order groupOrder,a.operator_flag operatorFlag,d.code,d.comp_legal_person compLegalPerson,u.nick_name name,u.id_card idCard,u.phonenumber phone,
-               u.email,u.home,u.address,u.sex,u.nationality,u.id_type idType,u.birth,r.role_name roleName,d.dept_name applicantOrgName,a.user_id userId
+        select c.id caseAppliId,a.id,a.role_type roleType,a.group_order groupOrder,a.operator_flag operatorFlag,d.code,d.comp_legal_person compLegalPerson,u.id_card idCard,u.phonenumber phone,
+               u.email,
+        (case when a.user_id is null then d.dept_name else u.nick_name end)  name,
+        (case when a.user_id is null then d.home else u.home end) home,
+        (case when a.user_id is null then d.address else u.address end) address,
+        (case when a.user_id is null then d.nationality else u.nationality end) nationality,
+        u.sex,u.id_type idType,u.birth,r.role_name roleName,d.dept_name applicantOrgName,a.user_id userId,a.applicant_dept_id applicantDeptId,c.organize_flag organizeFlag,c.case_source caseSource
        FROM
            ms_case_application c
                JOIN ms_case_affiliate a ON  c.id = a.case_appli_id