Accept Merge Request #30: (develop-wxl -> master)

Merge Request: 移动端流程增加申请人部门

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/smarCampus/d/iHotel_student_houtai/git/merge/30?initial=true

src/main/resources/mapper/template/ApplicationProcedureTemporaryMapper.xml

@@ -224,12 +224,14 @@
             a.name as approverName,
             a2.name as secondaryApproverName,
             u.user_name as usersName,
-            ap.house_count as houseCount
+            ap.house_count as houseCount,
+            o.name as orgName
         FROM
             `application_procedure_temporary` ap
                 LEFT JOIN admin a on a.id=ap.approver_id
                 LEFT JOIN admin a2 on a2.id=ap.secondary_approver_id
                 LEFT JOIN users u on u.id=ap.users_id and u.deleted=0
+                LEFT JOIN organization o on o.id=u.organ_id
         where
             ap.deleted=0
           AND ap.id=#{id}
@@ -265,17 +267,19 @@
             ap.secondary_examine_and_approve_time as secondaryExamineAndApproveTime,
             ap.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
             u.user_name as usersName,
-            ap.house_count as houseCount
+            ap.house_count as houseCount,
+            o.name as orgName
         FROM
             `application_procedure_temporary` ap
-                LEFT JOIN users u on u.id=ap.users_id and u.deleted=0
+            LEFT JOIN users u on u.id=ap.users_id and u.deleted=0
+            LEFT JOIN organization o on o.id=u.organ_id
         where
             ap.deleted=0
         <if test="startTime != null and startTime != ''  and  endTime != null and startTime != '' ">
             AND ap.submission_time>=#{startTime} and #{endTime}>=ap.submission_time
         </if>
         <if test="orgList != null and orgList.size() > 0">
-            and ap.orgId in
+            and u.organ_id in
             <foreach collection="orgList" item="orgId" index="index" open="(" close=")" separator=",">
                 ${orgId}
             </foreach>
@@ -303,17 +307,19 @@
         ap.secondary_examine_and_approve_time as secondaryExamineAndApproveTime,
         ap.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
         u.user_name as usersName,
-        ap.house_count as houseCount
+        ap.house_count as houseCount,
+        o.name as orgName
         FROM
         `application_procedure_temporary` ap
         LEFT JOIN users u on u.id=ap.users_id and u.deleted=0
+        LEFT JOIN organization o on o.id=u.organ_id
         where
         ap.deleted=0
         <if test="startTime != null and startTime != ''  and  endTime != null and startTime != '' ">
             AND ap.submission_time>=#{startTime} and #{endTime}>=ap.submission_time
         </if>
         <if test="orgList != null and orgList.size() > 0">
-            and ap.orgId in
+            and u.organ_id in
             <foreach collection="orgList" item="orgId" index="index" open="(" close=")" separator=",">
                 ${orgId}
             </foreach>