会计报销-其他公司的报销用户在列表不显示

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/xml/CwReimbursementInfoMapper.xml

@@ -71,7 +71,20 @@
                              WHEN a.source_type = 3 THEN b3.`number_count`
                              WHEN a.source_type = 4 THEN b4.`number_count`
                              ELSE b5.`number_count` END) AS `number_count`,
-
+						(CASE
+							 WHEN a.source_type = 1 THEN b.user_id
+							 WHEN a.source_type = 2 THEN b2.user_id
+							 WHEN a.source_type = 3 THEN b3.user_id
+							 WHEN a.source_type = 4 THEN b4.user_id
+							 WHEN a.source_type = 6 THEN b6.user_id
+							 ELSE b5.user_id END) AS user_id,
+						(CASE
+							 WHEN a.source_type = 1 THEN b.dept_id
+							 WHEN a.source_type = 2 THEN b2.dept_id
+							 WHEN a.source_type = 3 THEN b3.dept_id
+							 WHEN a.source_type = 4 THEN b4.dept_id
+							 WHEN a.source_type = 6 THEN b6.dept_id
+							 ELSE b5.dept_id END) AS dept_id,
                         a.reimbursement_type,
                         a.user_name,
                         a.reim_date,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -323,12 +323,12 @@ public class CwReimbursementInfoService {
             }
             if (StringUtils.isBlank(item.getDeptName())){
                 //处理部门名
-                String offices = getOfficeNameByIds(item.getProjectOffice());
+                String offices = getOfficeNameByIds(item.getDeptId());
                 item.setDeptName(offices);
             }
             if(StringUtils.isBlank(item.getName())){
                 //处理用户名
-                String names = userApi.getNamesByIds(item.getProjectUser());
+                String names = userApi.getNamesByIds(item.getUserId());
                 item.setName(names);
             }
         });

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/dto/RetureListDto.java

@@ -89,6 +89,16 @@ public class RetureListDto {
     private BigDecimal number;
 
     /**
+     * 报销人id
+     */
+    private String userId;
+    /**
+     * 报销人部门id
+     */
+    private String deptId;
+
+
+    /**
      * 报销金额汇总
      */
     private String numberCount;