【DAOP-1.0】企业认证

【功能点】测试问题处理

@@ -550,7 +550,6 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
 
 
     private StaffRSVO getCurStaff(){
     private StaffRSVO getCurStaff(){
         UserInfo userInfo = UserContextHolder.get();
         UserInfo userInfo = UserContextHolder.get();
-        userInfo.getUserId();
         StaffRSVO staffVO = personelFeign.getByUserGuid(userInfo.getUserId()).getData();
         StaffRSVO staffVO = personelFeign.getByUserGuid(userInfo.getUserId()).getData();
         return staffVO;
         return staffVO;
     }
     }

@@ -31,6 +31,7 @@ import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService;
 import com.csbr.qingcloud.portal.service.EnterpriseService;
 import com.csbr.qingcloud.portal.service.EnterpriseService;
 import com.csbr.qingcloud.portal.util.ObjectUtil;
 import com.csbr.qingcloud.portal.util.ObjectUtil;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
 import csbr.cloud.entity.domain.base.vo.PageListVO;
+import csbr.cloud.entity.domain.user.UserInfo;
 import csbr.cloud.entity.enums.ApprovalStateEnum;
 import csbr.cloud.entity.enums.ApprovalStateEnum;
 import csbr.cloud.entity.utils.UserContextHolder;
 import csbr.cloud.entity.utils.UserContextHolder;
 import io.seata.common.util.DateUtil;
 import io.seata.common.util.DateUtil;
@@ -522,17 +523,21 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
 
 
     @Override
     @Override
     public Boolean check(EnterpriseRQVO vo) {
     public Boolean check(EnterpriseRQVO vo) {
-        //防止管理员帐号发起认证
-        if(StringUtils.isBlank(vo.getGuid())){
-            checkUser(vo.getLogonUser());
-        }
-
-        //检查会员名称等数据
+        //非认证会员才需要检查会员名称等数据
+        StaffRSVO staff = getCurStaff();
+        if("非认证会员".equals(staff.getTenantName())){
             TenantRQVO tenant = csbrBeanUtil.convert(vo,TenantRQVO.class);
             TenantRQVO tenant = csbrBeanUtil.convert(vo,TenantRQVO.class);
             personelFeign.checkTenant(tenant);
             personelFeign.checkTenant(tenant);
+        }
         return true;
         return true;
     }
     }
 
 
+    private StaffRSVO getCurStaff(){
+        UserInfo userInfo = UserContextHolder.get();
+        StaffRSVO staffVO = personelFeign.getByUserGuid(userInfo.getUserId()).getData();
+        return staffVO;
+    }
+
     private void checkUser(String logonUser){
     private void checkUser(String logonUser){
         UserQueryDTO dto = new UserQueryDTO();
         UserQueryDTO dto = new UserQueryDTO();
         dto.setLogonUser(logonUser);
         dto.setLogonUser(logonUser);