修改企业审核接口

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/OrgEnum.java

@@ -32,7 +32,7 @@ public enum OrgEnum {
     public static HashMap<String,String>  map= new HashMap();
 
     static {
-        for(OrgPersonEnum orgPersonEnum:OrgPersonEnum.values()){
+        for(OrgEnum orgPersonEnum:OrgEnum.values()){
             map.put(orgPersonEnum.getKey(),orgPersonEnum.getName());
         }
     }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java

@@ -506,5 +506,18 @@ public class CompanyController extends BaseController {
 
 	}
 
+
+	/**
+	 * 验证手机号验证码是否成功
+	 *
+	 * @return
+	 */
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/tset")
+	@ApiOperation(httpMethod = "GET", value = "验证手机号验证码是否成功", notes = "验证手机号验证码是否成功")
+	public void tset() {
+		orgServiceImpl.getReginParams();
+	}
+
 }
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/CompanyServiceImpl.java

@@ -141,7 +141,14 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
             for(String code : unitTypeCodes) {
                 roleNameSet.add(OrgEnum.map.get(code));
             }
-            userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(roleNameSet)).collect(Collectors.toList());
+            Iterator iterator = roleNameSet.iterator();
+
+            allRoleList.stream().forEach(r -> {
+                if(roleNameSet.contains(r.getRoleName())){
+                    userRoleList.add(r);
+                }
+            });
+
             userRoleList.stream().forEach(r -> {
                 roleIds.add(r.getSequenceNbr());
             });
@@ -162,7 +169,7 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
             agencyUserModel.setUserName(adminLoginName);
             agencyUserModel.setPassword(DesUtil.encode(adminPassword, secretKey));
             agencyUserModel.setRePassword(DesUtil.encode(adminPassword, secretKey));
-            Privilege.agencyUserClient.create(agencyUserModel);
+            agencyUserModel = Privilege.agencyUserClient.create(agencyUserModel).getResult();
 
             //企业动态表单存储
             JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(company));
@@ -175,7 +182,8 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
             jsonObject.put("name",adminName);
             jsonObject.put("phone",adminPhone);
             jsonObject.put("amosOrgId",agencyUserModel.getSequenceNbr());
-            orgServiceImpl.dataHandling(jsonObject, OrgEnum.企业管理员.getKey(),null);
+            jsonObject.put("isCheck",companyModelFeignClient.getSequenceNbr());
+            orgServiceImpl.dataHandling(jsonObject, OrgEnum.普通人员.getKey(),null);
         }
         return this.updateById(company);
     }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java

@@ -133,12 +133,19 @@ public class OrgServiceImpl {
             orgUsr.setBizOrgCode(jsonObject.getString("creditCode"));
         }
         if (OrgEnum.普通人员.getKey().equals(bizOrgType)){
-            if (1==jsonObject.getInteger("isWelder")) {
-                orgUsr.setOrgExpandAttr1(OrgEnum.焊工.getKey());
-                orgUsr.setCode(getCode());
+            if(!ValidationUtil.isEmpty(jsonObject.getInteger("isWelder"))){
+                if (1==jsonObject.getInteger("isWelder")) {
+                    orgUsr.setOrgExpandAttr1(OrgEnum.焊工.getKey());
+                    orgUsr.setCode(getCode());
+                }
             }
             LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(reginParams.getCompany().getSequenceNbr()));
+            if (!ValidationUtil.isEmpty(jsonObject.getLong("isCheck"))) {
+                wrapper.eq(OrgUsr :: getAmosOrgId,jsonObject.getLong("isCheck"));
+            } else {
+                wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(reginParams.getCompany().getSequenceNbr()));
+            }
+
             orgUsr.setParentId(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()));
         }
         if (OrgEnum.部门.getKey().equals(bizOrgType)) {