苏州公司，选择签字注师时-添加-程爱国

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -1046,12 +1046,23 @@ public class ReimbursementInfoService {
         UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         List<TreeUserDto> list = new ArrayList<>();
         List<TreeUserDto> officeList = Lists.newArrayList();
+        boolean isSz = false;
         // 查询部门
         if(userDTO.isAdmin() || (null != userDTO.getTenantDTO() && "10002".equals(userDTO.getTenantDTO().getId()))){
             officeList = infoMapper.findOfficeListByNotTenantId("10000");
         }else{
             officeList = infoMapper.findOfficeListByCompanyId(userDTO.getCompanyDTO().getId());
         }
+        //单独处理苏州分公司添加程爱国的问题
+        if("苏州分公司".equals(userDTO.getCompanyDTO().getName())){
+            isSz = true;
+            List<TreeUserDto> officeListByTenantId = infoMapper.findOfficeListByTenantId("10003");
+            List<TreeUserDto> tempOfficeList = officeListByTenantId.stream()
+                    .filter(item -> "江苏兴光会计".equals(item.getName()) ||
+                            "兴光审计一部".equals(item.getName()))
+                    .collect(Collectors.toList());
+            officeList.addAll(tempOfficeList);
+        }
         List<TreeUserDto> filterList = new ArrayList<>();
         filterList.addAll(officeList);
         if(null != userDTO && null != userDTO.getOfficeDTO() && StringUtils.isNotBlank(userDTO.getOfficeDTO().getId()) && ("1826176524081065985".equals(userDTO.getOfficeDTO().getId()) || "1826176609011527681".equals(userDTO.getOfficeDTO().getId()))) {
@@ -1188,6 +1199,17 @@ public class ReimbursementInfoService {
 
         // 查询用户
         List<TreeUserDto> userList = infoMapper.findUserList(name);
+        //如果当前用户为苏州公司的，则单独查询程爱国信息添加至list
+        if(isSz){
+            UserDTO szNeedUser = SpringUtil.getBean(IUserApi.class).getByLoginNameNotTenantId("程爱国");
+            TreeUserDto treeUserDto = new TreeUserDto();
+            treeUserDto.setId(szNeedUser.getId());
+            treeUserDto.setName(szNeedUser.getName());
+            treeUserDto.setParentId(szNeedUser.getOfficeDTO().getId());
+            treeUserDto.setOfficeName(szNeedUser.getOfficeDTO().getName());
+            treeUserDto.setIsUser(true);
+            userList.add(treeUserDto);
+        }
         //查询综合管理公司用户信息
         List<TreeUserDto> userList1=infoMapper.findZhglgsUserList(name);