客户转移&客户转移申请

fs-company/src/main/java/com/fs/users/controller/MyCompanyCustomerController.java

@@ -45,6 +45,9 @@ public class MyCompanyCustomerController {
      */
     @GetMapping("/list")
     public TableDataInfo list(SelectCusListPageParam param){
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        Long companyId = loginUser.getCompany().getCompanyId();
+        param.setCompanyId(companyId);
         return fsUserService.selectCusListPage(param);
     }
     /**

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -177,9 +177,9 @@ public class FsUserServiceImpl implements IFsUserService
                 }
             }
             if(ObjectUtils.isNotNull(fsUser.getCompanyUserId())){
-                CompanyUser companyUser = companyUserCacheService.selectCompanyUserById(fsUser.getUserId());
+                CompanyUser companyUser = companyUserCacheService.selectCompanyUserById(fsUser.getCompanyUserId());
                 if(ObjectUtils.isNotNull(companyUser)){
-                    fsUser.setCompanyUserName(companyUser.getNickName());
+                    fsUser.setCompanyUserName(String.format("%s_%d",companyUser.getUserName(),companyUser.getUserId()));
                 }
             }
         }
@@ -395,7 +395,7 @@ public class FsUserServiceImpl implements IFsUserService
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+    @Transactional(propagation = Propagation.SUPPORTS, rollbackFor = Exception.class)
     public void transfer(FsUserTransferParamDTO param) {
         Asserts.check(ObjectUtils.isNotNull(param.getSourceCompanyUserId()), "来源用户不能为空！");
         Asserts.check(ObjectUtils.isNotNull(param.getTargetCompanyUserId()), "转移用户不能为空！");

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -345,9 +345,7 @@
     </update>
     <update id="transferCompanyUser">
         update fs_user
-
         set company_user_id=#{targetCompanyUserId}
-
         where
             user_id in
         <foreach collection="userIds" open="(" close=")" separator="," item="item">