自动转移代码优化

fs-admin/src/main/java/com/fs/company/controller/CompanyController.java

@@ -77,7 +77,7 @@ public class CompanyController extends BaseController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         String json = configService.selectConfigByKey("course.config");
         CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
+        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept() && !checkDept(loginUser.getUser().getDeptId())){
             param.setDeptId(loginUser.getDeptId());
         }
         List<CompanyVO> list = companyService.selectCompanyVOList(param);

fs-service/src/main/java/com/fs/qw/service/impl/CustomerTransferApprovalServiceImpl.java

@@ -138,7 +138,12 @@ public class CustomerTransferApprovalServiceImpl implements ICustomerTransferApp
                 FsUserCompanyUser userCompanyUser = userCompanyUserService.selectByUserIdAndProjectId(customerId.getUserId(), customerId.getProjectId());
                 if(Objects.nonNull(userCompanyUser)){
                     CompanyUser companyUser = companyUserCacheService.selectCompanyUserById(userCompanyUser.getCompanyUserId());
-                    String companyUserName = String.format("%s_%d", companyUser.getUserName(), companyUser.getUserId());
+                    if(companyUser == null){
+                        companyUser =new CompanyUser();
+                        companyUser.setCompanyName(userCompanyUser.getCompanyUserId().toString());
+                        companyUser.setUserId(userCompanyUser.getCompanyUserId());
+                    }
+                    String companyUserName = String.format("%s_%d", companyUser, companyUser.getUserId());
 
                     CompanyUser afterCompanyUser = companyUserCacheService.selectCompanyUserById(item.getTargetUserId());
                     String afterCompanyUserName = String.format("%s_%d", afterCompanyUser.getUserName(), companyUser.getUserId());