Merge branch 'develop'

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

@@ -11,6 +11,7 @@ import com.mmc.iuav.user.util.QccEntAuthUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author: zj
@@ -27,6 +28,7 @@ public class CompanyAuthServiceImpl implements CompanyAuthService {
     private CompanyAuthDao companyAuthDao;
 
     @Override
+    @Transactional
     public ResultBody add(CompanyAuthVO companyAuthVO) {
         log.info("用户:"+companyAuthVO.getUserAccountId()+" 企业认证：{}", JSONObject.toJSONString(companyAuthVO));
         CompanyAuthDO companyAuthDO = companyAuthDao.getCompanyAuth(companyAuthVO.getUserAccountId());
@@ -34,9 +36,7 @@ public class CompanyAuthServiceImpl implements CompanyAuthService {
             return ResultBody.success("已通过");
         }
         ResultBody companyCheckRes = this.companyCheck(companyAuthVO);
-        System.out.println(companyCheckRes);
         if (!companyCheckRes.getCode().equals("200")){
-
             return companyCheckRes;
         }
         companyAuthDO = new CompanyAuthDO(companyAuthVO);

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

@@ -26,6 +26,6 @@
 
     <select id="getCompanyAuth" resultType="com.mmc.iuav.user.entity.CompanyAuthDO">
         select id,user_account_id,company_name,credit_code,license_img,auth_status
-        from company_auth where user_account_id = #{userAccountId}
+        from company_auth where user_account_id = #{userAccountId} and is_deleted = 0
     </select>
 </mapper>
\ No newline at end of file

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: d1aada4cc1724c9071e1580f0bcec9cd2d4dc140
+  newTag: 1d021790d2877cb9cc492d3c6acdc68db0ed5ff2