Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/cms into develop

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/CompanyMemberDO.java

@@ -20,7 +20,7 @@ public class CompanyMemberDO implements Serializable {
     private Integer id;
     private Integer userAccountId;
     private Integer companyInfoId;
-    private Integer isLeader;
+    private Integer leader;
     private Date createTime;
 
     private String roleName;
@@ -28,7 +28,7 @@ public class CompanyMemberDO implements Serializable {
     public CompanyMemberVO builCompanyMemberVO(){
         return CompanyMemberVO.builder()
                 .userAccountId(userAccountId)
-                .roleId(isLeader)
+                .roleId(leader)
                 .roleName(roleName)
                 .build();
     }

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

@@ -62,7 +62,7 @@ public class CompanyAuthServiceImpl implements CompanyAuthService {
         CompanyMemberDO companyMemberDO = new CompanyMemberDO();
         companyMemberDO.setCompanyInfoId(companyInfoDO.getId());
         companyMemberDO.setUserAccountId(companyAuthVO.getUserAccountId());
-        companyMemberDO.setIsLeader(1);
+        companyMemberDO.setLeader(1);
         companyDao.addCompanyMember(companyMemberDO);
         return ResultBody.success();
     }

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

@@ -173,7 +173,7 @@ public class CompanyServiceImpl implements CompanyService {
         CompanyMemberDO companyMemberDO = new CompanyMemberDO();
         companyMemberDO.setUserAccountId(userAccountId);
         companyMemberDO.setCompanyInfoId(companyInfoId);
-        companyMemberDO.setIsLeader(leader);
+        companyMemberDO.setLeader(leader);
         companyDao.addCompanyMember(companyMemberDO);
         return ResultBody.success();
     }
@@ -197,7 +197,7 @@ public class CompanyServiceImpl implements CompanyService {
     public ResultBody unbindCompanyMember(LoginSuccessDTO userLoginInfoFromRedis, Integer userAccountId, Integer companyInfoId) {
         CompanyMemberDO companyMemberDO = companyDao.getCompanyMember(userAccountId, companyInfoId);
         if (companyMemberDO != null) {
-            if (companyMemberDO.getIsLeader().equals(1)) {
+            if (companyMemberDO.getLeader().equals(1)) {
                 return ResultBody.error(ResultEnum.UNBIND_COMPANY_MEMBER_ERROR);
             }
         }
@@ -210,7 +210,7 @@ public class CompanyServiceImpl implements CompanyService {
     public ResultBody transferLeader(LoginSuccessDTO loginSuccessDTO, Integer fromUserAccountId, Integer toUserAccountId, Integer companyInfoId) {
         CompanyMemberDO companyMemberDO = companyDao.getCompanyMember(fromUserAccountId, companyInfoId);
         if (companyMemberDO != null) {
-            if (!companyMemberDO.getIsLeader().equals(1)) {
+            if (!companyMemberDO.getLeader().equals(1)) {
                 return ResultBody.error(ResultEnum.TRANFER_COMPANY_MEMBER_LEADER_ERROR);
             }
         }

csm-service/cms-service-user/src/main/resources/mapper/CompanyDao.xml

@@ -19,7 +19,7 @@
     <insert id="addCompanyMember" parameterType="com.mmc.iuav.user.entity.CompanyMemberDO" keyProperty="id"
             useGeneratedKeys="true">
         insert into company_member(user_account_id, company_info_id, is_leader, create_time)
-        values (#{userAccountId}, #{companyInfoId}, #{isLeader}, NOW())
+        values (#{userAccountId}, #{companyInfoId}, #{leader}, NOW())
     </insert>
     <insert id="insertUserRcd">
         insert into user_rcd(user_account_id,rcd_user_id,create_time) values (#{userId},#{rUserId},NOW())
@@ -221,7 +221,7 @@
             company_info ci
             INNER JOIN company_member cm ON ci.id = cm.company_info_id
         WHERE
-            cm.user_account_id = #{userAccountId} and ci.is_deleted = 0
+            cm.user_account_id = #{userAccountId} and ci.is_deleted = 0 and is_leader = 1
     </select>
 
     <select id="getCompanyBackUserByCompanyId" resultType="com.mmc.iuav.user.entity.CompanyBackUserDO">

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: 5fd98abc4eec2a93935f18a9d497fc9c3422cea4
+  newTag: 2f8bcd21de517994fcf4bc78230865c78341e785