项目组成员调整

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/service/JyProjectService.java

@@ -327,14 +327,15 @@ public class JyProjectService {
         //保存项目组成员
         List<String> strings = new ArrayList<>();
         strings.add(userDTO.getId());
-        //将部门主任添加到项目组成员中
+        strings.add(dto.getProjectLeader());
+        /*//将部门主任添加到项目组成员中
         List<UserDTO> listByOfficeId = SpringUtil.getBean(IUserApi.class).findListByOfficeId(userDTO.getOfficeDTO().getId());
         for (UserDTO userDTO1 : listByOfficeId) {
             if (userDTO1.getManageOfficeIds().contains(userDTO.getOfficeDTO().getId()) && StringUtils.isNotBlank(userDTO1.getManageOfficeIds())){
                 strings.add(userDTO1.getId());
                 break;
             }
-        }
+        }*/
         for (String string : strings) {
             JyProjectMembers jyProjectMembers = new JyProjectMembers();
             String memberId = UUID.randomUUID().toString().replace("-", "");

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/reimbursement/mapper/xml/JyReimbursementInfoMapper.xml

@@ -43,10 +43,10 @@
 			WHEN a.apply_type = 3 THEN us3.name
 									ELSE us4.name END) AS name,
 			(CASE
-			WHEN a.apply_type = 1 THEN b.`number`
-			WHEN a.apply_type = 2 THEN b2.`number`
-			WHEN a.apply_type = 3 THEN b3.`number`
-									ELSE b4.`number` END) AS `number`,
+			WHEN a.apply_type = 1 THEN trim(b.`number`)
+			WHEN a.apply_type = 2 THEN trim(b2.`number`)
+			WHEN a.apply_type = 3 THEN trim(b3.`number`)
+									ELSE trim(b4.`number`) END) AS `number`,
 			c.name as createName,
 			o.name as officeName,
 			a.create_time,