Merge branch 'develop'

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CompanyServiceImpl.java

@@ -6,6 +6,7 @@ import com.mmc.iuav.response.ResultEnum;
 import com.mmc.iuav.user.client.PmsClient;
 import com.mmc.iuav.user.dao.BackUserAccountDao;
 import com.mmc.iuav.user.dao.CompanyDao;
+import com.mmc.iuav.user.dao.UserServiceDao;
 import com.mmc.iuav.user.entity.*;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.qo.CompanyInfoQO;
@@ -36,6 +37,9 @@ public class CompanyServiceImpl implements CompanyService {
     @Autowired
     private BackUserAccountDao backUserAccountDao;
 
+    @Autowired
+    private UserServiceDao userServiceDao;
+
     @Override
     public ResultBody addCompanyInfo(CompanyInfoVO companyInfo) {
         int count = companyDao.countCompanyNames(companyInfo.getId(), companyInfo.getCompanyName());
@@ -191,6 +195,7 @@ public class CompanyServiceImpl implements CompanyService {
     }
 
     @Override
+    @Transactional
     public ResultBody transferLeader(LoginSuccessDTO loginSuccessDTO, Integer fromUserAccountId, Integer toUserAccountId, Integer companyInfoId) {
         CompanyMemberDO companyMemberDO = companyDao.getCompanyMember(fromUserAccountId, companyInfoId);
         if (companyMemberDO != null) {
@@ -200,6 +205,22 @@ public class CompanyServiceImpl implements CompanyService {
         }
         companyDao.updateCompanyMember(fromUserAccountId, 0, companyInfoId);
         companyDao.updateCompanyMember(toUserAccountId, 1, companyInfoId);
+        // 后台账号电话应该为现在管理员的电话
+        UserAccountDO accountDO = userServiceDao.getUserAccountById(toUserAccountId);
+        CompanyBackUserDO companyBackUserDO = companyDao.getCompanyBackUserByCompanyId(companyInfoId);
+        if (accountDO != null && companyBackUserDO != null) {
+            BackUserAccountDO backUserAccountDO = new BackUserAccountDO();
+            backUserAccountDO.setId(companyBackUserDO.getBackUserAccountId());
+            backUserAccountDO.setPhoneNum(accountDO.getPhoneNum());
+            backUserAccountDao.updateBackUserAccount(backUserAccountDO);
+        } else {
+            return ResultBody.error(ResultEnum.LOGIN_ACCOUNT_NOT_EXIT_ERROR);
+        }
+        CompanyInfoDO companyInfoDO = companyDao.getCompanyInfoById(companyInfoId);
+        if (companyInfoDO != null) {
+            companyInfoDO.setPhoneNum(accountDO.getPhoneNum());
+            companyDao.updateCompanyInfo(companyInfoDO);
+        }
         return ResultBody.success();
     }
 

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 6dd626898acea6649ad018cdc47aa0c2a5ca213d
+  newTag: e17cb763cc7c8206bdb83602bd016fcbfaa515eb