【DAOP-1.0】企业认证

【功能点】测试问题处理

@@ -452,12 +452,29 @@ 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());
+        }
+
         //检查会员名称等数据
         //检查会员名称等数据
         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 void checkUser(String logonUser){
+        UserQueryDTO dto = new UserQueryDTO();
+        dto.setLogonUser(logonUser);
+        List<UserVO> userList = userFeign.getUserSomeInfo(dto).getData().getRecords();
+        if(CollectionUtils.isNotEmpty(userList)){
+            StaffRSVO staffVO = personelFeign.getByUserGuid(userList.get(0).getGuid()).getData();
+            if(staffVO != null && StringUtils.isNotBlank(staffVO.getIsAdmin()) && "Y".equals(staffVO.getIsAdmin())){
+                throw new CsbrUserException(UserError.VALIDATE_CODE_ERROR, "账号已存在！");
+            }
+        }
+    }
+
     /**
     /**
      * 获取发起流程参数
      * 获取发起流程参数
      * @author xcq
      * @author xcq