Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/DepartmentDto.java

+package com.yeejoin.amos.boot.module.ugp.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @Author cpp
+ * @Description  部门负责人 部门名称
+ * @Date 2022/10/25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="DepartmentDto", description="接收参数")
+public class DepartmentDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "部门名称")
+    private String departmentName;
+
+    @ApiModelProperty(value = "部门负责人")
+    private String departmentHead;
+}

amos-boot-system-ugp/amos-boot-module-ugp-biz/pom.xml

@@ -31,6 +31,22 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.24</version>
         </dependency>
+        <dependency>
+            <groupId>fakepath</groupId>
+            <artifactId>ugp-welding-evaluation-inspection-sdk</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.xerial</groupId>
+            <artifactId>sqlite-jdbc</artifactId>
+            <version>3.36.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.drools</groupId>
+            <artifactId>drools-compiler</artifactId>
+            <version>7.10.0.Final</version>
+        </dependency>
+
 
     </dependencies>
     <build>

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

@@ -16,6 +16,7 @@ import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
+import com.yeejoin.amos.boot.module.ugp.api.dto.DepartmentDto;
 import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper;
@@ -34,8 +35,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-
 import java.util.*;
 
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.CompanyServiceImpl;
@@ -206,6 +205,18 @@ public class CompanyController extends BaseController {
 	public ResponseModel<OrgUsrDto> getInfo(@RequestBody JSONObject jsonObject, String bizOrgType,String sequenceNbr){
 		return ResponseHelper.buildResponse(orgServiceImpl.dataHandling(jsonObject,bizOrgType,sequenceNbr));
 	}
+
+	/***
+	 * 部門新增
+	 * @param dto
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@PostMapping(value = "department")
+	@ApiOperation(httpMethod = "POST", value = "部門新增", notes = "部門新增")
+	public ResponseModel<Boolean> getInfo(@RequestBody DepartmentDto dto) {
+		return ResponseHelper.buildResponse(companyServiceImpl.saveDepartment(dto));
+	}
 	/**
 	 * 企业注册：获取单位类型
 	 */
@@ -333,13 +344,8 @@ public class CompanyController extends BaseController {
 			}
 		}
 		return ResponseHelper.buildResponse(flag);
-	}
-
-
-
-
-
 
+	}
 
 }
 

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

@@ -20,6 +20,7 @@ import com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.ProjectResourceServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.ProjectServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.WelderServiceImpl;
+import com.yeejoin.amos.feign.privilege.Privilege;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.poi.ss.formula.functions.T;
@@ -156,10 +157,12 @@ public class WelderController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-    @DeleteMapping(value = "/{sequenceNbr}")
+    @DeleteMapping(value = "/deleteOneById/{sequenceNbr}")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr删除人员信息表", notes = "根据sequenceNbr删除人员信息表")
-    public void deleteOneById(@PathVariable String sequenceNbr) throws Exception {
+    public ResponseModel<String> deleteOneById(@PathVariable String sequenceNbr) throws Exception {
+        Privilege.agencyUserClient.multDeleteUser(orgServiceImpl.getOrgUsrById(sequenceNbr).getAmosOrgId());
         orgServiceImpl.delectInfo(sequenceNbr);
+        return ResponseHelper.buildResponse("ok");
     }
 
     /**

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

@@ -2,25 +2,26 @@ package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
+import com.yeejoin.amos.boot.module.ugp.api.dto.DepartmentDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.ICompanyService;
 import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
+import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import com.yeejoin.amos.feign.privilege.util.DesUtil;
-import org.apache.lucene.queryparser.flexible.messages.Message;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -44,11 +45,13 @@ import java.util.stream.Collectors;
  * @date 2022-09-22
  */
 @Service
+
 public class CompanyServiceImpl extends BaseService<CompanyDto, Company, CompanyMapper> implements ICompanyService {
 
     @Autowired
     CompanyMapper companyMapper;
     @Autowired
+    OrgServiceImpl orgService;
     ICompanyService iCompanyService;
 
     @Value("${amos.secret.key}")
@@ -82,6 +85,33 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
         return page1;
     }
 
+    /**
+     * 新增部门和负责人
+     * @return
+     */
+    @BusinessIdentify
+    public Boolean saveDepartment(DepartmentDto dto){
+        if (ValidationUtil.isEmpty(dto)) {
+            return false;
+        }
+
+        //平台添加
+        DepartmentModel departmentModel = new DepartmentModel( );
+        ReginParams reginParams = orgService.getReginParams();
+        departmentModel.setCompanySeq(reginParams.getCompany().getSequenceNbr());
+        departmentModel.setDepartmentName(dto.getDepartmentName());
+        departmentModel.setLevel("dept");
+        departmentModel.setParentId(1L);
+        departmentModel = Privilege.departmentClient.create(departmentModel).getResult();
+        //业务添加
+        JSONObject jsonObject = new JSONObject( );
+        jsonObject.put("amosOrgId",departmentModel.getSequenceNbr());
+        jsonObject.put("amosOrgCode",departmentModel.getOrgCode());
+        OrgUsrDto orgUsrDto = orgService.dataHandling(jsonObject, OrgEnum.部门.getKey( ), null);
+
+        return  true;
+    }
+
 
 
 

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

@@ -217,9 +217,12 @@ public class OrgServiceImpl {
      */
     public Map getdetialInfo(String sequenceNbr){
         Map map = new HashMap();
+        OrgUsr orgUsr = getOrgUsrById(sequenceNbr);
+        String type = orgUsr.getOrgExpandAttr1();
         LambdaQueryWrapper<DynamicFormInstance> instanceWrapper = new LambdaQueryWrapper<>();
         instanceWrapper.eq(DynamicFormInstance :: getInstanceId,sequenceNbr);
         List<DynamicFormInstance> dynamicFormInstanceList = alertFormValueServiceImpl.list(instanceWrapper);
+        map.put("type",type);
         map.put("sequenceNbr",sequenceNbr);
         for (DynamicFormInstance dynamicFormInstance : dynamicFormInstanceList) {
             map.put(dynamicFormInstance.getFieldCode(),dynamicFormInstance.getFieldValue());

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

@@ -3,10 +3,15 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+import com.mao.demo1.TestWeldingRules;
+import com.mao.demo1.material.MyPqr;
+import com.mao.demo1.material.MyWps;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.StageEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.VerifyEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.VerifyTypeEnum;
-import com.yeejoin.amos.boot.module.ugp.api.Enum.WeldCodeEnum;
+
 import com.yeejoin.amos.boot.module.ugp.api.dto.*;
 import com.yeejoin.amos.boot.module.ugp.api.entity.QualityProblem;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Verify;
@@ -36,6 +41,8 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
     WeldServiceImpl weldService;
     @Autowired
     WeldMapper weldMapper;
+    @Autowired
+    OrgServiceImpl orgService;
 
     @Autowired
     VerifyMapper verifyMapper;
@@ -67,27 +74,68 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
      * page 分页
      */
     public Page<SmartListDto> commonality(String stage,Page<SmartListDto> page){
-        List<Verify> commonality = verifyMapper.commonality(stage);
+        List<Verify> verifyList = verifyMapper.commonality(stage);
         List<SmartListDto> dtoList =new ArrayList<>();
         //进入焊前
-        if (commonality !=null && commonality.size() !=0){
-
-            for (Verify verify : commonality) {
-                SmartListDto beforeDto = new SmartListDto( );
-                beforeDto.setSequenceNbr(verify.getSequenceNbr());//智能监检表id
-                beforeDto.setProjectId(verify.getProjectId());  //项目id
-                beforeDto.setName(verify.getProject().getName());//项目名称
-                beforeDto.setProjectCode(verify.getProject().getCode());//项目编号
-                beforeDto.setStatus(verify.getStatus());//检验状态
-                beforeDto.setType(verify.getType());//检验方式
-                beforeDto.setSubmitTime(verify.getVerifyTime());//交检日期
-                beforeDto.setVerifyTime(verify.getVerifyTime());//检验时间
-                beforeDto.setStage(verify.getStage());
+        if (verifyList !=null && verifyList.size() !=0){
+
+            for (Verify verify : verifyList) {
+
+                SmartListDto dto = new SmartListDto( );
+                dto.setSequenceNbr(verify.getSequenceNbr());//智能监检表id
+                dto.setProjectId(verify.getProjectId());  //项目id
+                dto.setName(verify.getProject().getName());//项目名称
+                dto.setProjectCode(verify.getProject().getCode());//项目编号
+                String status = verify.getStatus( );
+                if (status.equals("1")) {
+                    dto.setStatus(VerifyEnum.已通过.getName());//检验状态
+                    dto.setPeopleStatus("合格期内");//持证状态
+                }
+                if (status.equals("0")) {
+                    dto.setStatus(VerifyEnum.未通过.getName());//检验状态
+                    dto.setPeopleStatus("超期未检");//持证状态
+                }
+
+                dto.setType(verify.getType());//检验方式
+                dto.setSubmitTime(verify.getSubmitTime());//交检日期
+                dto.setVerifyTime(verify.getVerifyTime());//检验时间
+                String stage1 = verify.getStage( );//检验检测阶段
+                Map<String, String> map = StageEnum.getStatusByVerifyNameMap;
+                for (String key:map.keySet()){
+                    if (key.equals(stage1)) {
+                        dto.setStage(map.get(key).toString());//将阶段赋值
+                    }
+                }
+
                 String targetInfo = verify.getTargetInfo();//app上传数据
-                dtoList.add(beforeDto);
+                Map mapInfo = JSON.parseObject(targetInfo, Map.class);
+                for (Object o:mapInfo.keySet()){
+                    if (o.toString().equals("code")) {
+                        //获取焊口编号
+                        String code = (String)mapInfo.get(o.toString( ));
+                        dto.setCode(code);
+
+                    }
+
+                    if (o.toString().equals("peopleLocation")) {
+                        //获取焊接定位信息
+                        String peopleLocation = (String)mapInfo.get(o.toString( ));
+                        dto.setPeopleLocation(peopleLocation);
+                    }
+                    if (o.toString().equals("userId")) {
+                        //获取焊工信息
+                        String userId = (String)mapInfo.get(o.toString( ));
+                        OrgUsr orgUsr = orgService.getOrgUsrById(userId);
+
+                        dto.setPeopleName(orgUsr.getBizOrgName());//焊工姓名
+                        dto.setPeopleName(orgUsr.getCode());//焊工编号
+
+                    }
+                }
+
+                dtoList.add(dto);
             }
         }
-
         page.setRecords(dtoList);
         page.setTotal(dtoList.size());
 
@@ -104,7 +152,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
 
 
         if (dto == null) {
-            return "数据不存在";
+            return "未上传数据,请上传";
         }
         Verify verify = new Verify( );
         //获取公共属性信息
@@ -113,9 +161,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
         String peopleLocation = dto.getPeopleLocation( );//焊接定位信息
         String stage = dto.getStage( ); //阶段检验
         //获取当前校验时间
-        Date time = new Date( );
-
-
+        Date time = new Date();
 
 
         //人员
@@ -194,19 +240,12 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
 
         }
 
-
-
-
-
         //设备
         if (stage.equals(StageEnum.焊前设备.getVerifyName())&&dto.getFacilityPhoto() !=null && !dto.getFacilityPhoto().equals("")){
             //获取校验设备信息
-
-
             String facilityId = dto.getFacilityId( ); //设备id
             String calibrationStatus = dto.getCalibrationStatus( );//检定状态
             String facilityPhoto = dto.getFacilityPhoto( );//设备图片
-
             HashMap<String, String> mapfacilty = new HashMap<>( );
             mapfacilty.put("code",code);//焊口编号
             mapfacilty.put("peopleLocation",peopleLocation);//焊接定位信息
@@ -262,6 +301,18 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
 
 
             //数据校验
+
+            MyPqr pqr = new MyPqr( );
+            pqr.setCombox_type("高于上转变温度进行焊后热处理(如正火)");
+            pqr.setMaterial_a_thickness("1.4");
+            pqr.setMaterial_b_thickness("5");
+            pqr.setIf_bend("lateral_bending");
+
+
+            MyWps wps = new MyWps( );
+            wps.setMaterial_a_thickness("1.5");
+            wps.setMaterial_b_thickness("1.4");
+            HashMap<String, String> stringStringHashMap = new TestWeldingRules( ).droolsTest(pqr, wps);
             Boolean flag =false;
             if (!flag) {
                 //不通过, 添加数据并返回未通过结果
@@ -271,10 +322,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
 
             //校验通过
             this.addSuccessData(verify);
-
-
         }
-
         return VerifyEnum.已通过.getName();
 
     }
@@ -740,4 +788,25 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
         return effect(jsonObject,定位效验数量,true);
     }
 
+
+    /**
+     * 测试
+     * @param args
+     */
+    public static void main(String[] args) {
+        MyPqr pqr = new MyPqr( );
+        pqr.setCombox_type("高于上转变温度进行焊后热处理(如正火)");
+        pqr.setMaterial_a_thickness("1.4");//厚度
+        pqr.setMaterial_b_thickness("5");//厚度
+        pqr.setIf_bend("lateral_bending"); //弯度
+
+
+        MyWps wps = new MyWps( );
+        wps.setMaterial_a_thickness("1.5");
+        wps.setMaterial_b_thickness("1.4");
+        HashMap<String, String> stringStringHashMap = new TestWeldingRules( ).droolsTest(pqr, wps);
+        System.out.println(stringStringHashMap );
+
+    }
+
 }
\ No newline at end of file

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

@@ -18,6 +18,7 @@ import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -87,42 +88,45 @@ public class WelderServiceImpl {
      */
     @BusinessIdentify
     public OrgUsrDto savePerson(JSONObject jsonObject, String bizOrgType, String sequenceNbr){
-        Long companyId = orgService.getReginParams().getCompany().getSequenceNbr();
-        Set<String> roleNameSet = new HashSet<>();
-        List<RoleModel> userRoleList = new ArrayList<>();
-        List<Long> roleIds = new ArrayList<>();
-        Map<Long, List<Long>> roleSeqsMap = new HashMap<>();
-        AgencyUserModel agencyUserModel = new AgencyUserModel();
-        Map<Long,List<RoleModel>> orgRoles = new HashMap<>();
-        //用户基本信息
-        agencyUserModel.setRealName(jsonObject.getString("name"));
-        agencyUserModel.setAgencyCode("ugp");
-        agencyUserModel.setLockStatus("UNLOCK");
-        agencyUserModel.setMobile(jsonObject.getString("phone"));
-        agencyUserModel.setCreateTime(new Date());
-        agencyUserModel.setUserName(jsonObject.getString("phone"));
-        agencyUserModel.setPassword(DesUtil.encode(jsonObject.getString("phone"), secretKey));
-        agencyUserModel.setRePassword(DesUtil.encode(jsonObject.getString("phone"), secretKey));
-        //用户角色信息
-        List<RoleModel> allRoleList = Privilege.roleClient.queryRoleList(null,null).getResult();
-        if(1==jsonObject.getInteger("isWelder")){
-            roleNameSet.add(OrgEnum.焊工.getName());
-        } else {
-            roleNameSet.add(OrgEnum.普通人员.getName());
-        }
-        userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(roleNameSet)).collect(Collectors.toList());
-        userRoleList.stream().forEach(r -> {
-            if (!roleIds.contains(r.getSequenceNbr())) {
-                roleIds.add(r.getSequenceNbr());
+        if(ValidationUtil.isEmpty(sequenceNbr)){
+            Long companyId = orgService.getReginParams().getCompany().getSequenceNbr();
+            Set<String> roleNameSet = new HashSet<>();
+            List<RoleModel> userRoleList = new ArrayList<>();
+            List<Long> roleIds = new ArrayList<>();
+            Map<Long, List<Long>> roleSeqsMap = new HashMap<>();
+            AgencyUserModel agencyUserModel = new AgencyUserModel();
+            Map<Long,List<RoleModel>> orgRoles = new HashMap<>();
+            //用户基本信息
+            agencyUserModel.setRealName(jsonObject.getString("name"));
+            agencyUserModel.setAgencyCode("ugp");
+            agencyUserModel.setLockStatus("UNLOCK");
+            agencyUserModel.setMobile(jsonObject.getString("phone"));
+            agencyUserModel.setCreateTime(new Date());
+            agencyUserModel.setUserName(jsonObject.getString("phone"));
+            agencyUserModel.setPassword(DesUtil.encode(jsonObject.getString("phone"), secretKey));
+            agencyUserModel.setRePassword(DesUtil.encode(jsonObject.getString("phone"), secretKey));
+            //用户角色信息
+            List<RoleModel> allRoleList = Privilege.roleClient.queryRoleList(null,null).getResult();
+            if(1==jsonObject.getInteger("isWelder")){
+                roleNameSet.add(OrgEnum.焊工.getName());
+            } else {
+                roleNameSet.add(OrgEnum.普通人员.getName());
             }
-        });
-        roleSeqsMap.put(companyId,roleIds);
-        orgRoles.put(companyId,userRoleList);
-        agencyUserModel.setOrgRoleSeqs(roleSeqsMap);
-        agencyUserModel.setOrgRoles(orgRoles);
-        //创建用户
-        agencyUserModel = Privilege.agencyUserClient.create(agencyUserModel).getResult();
-        jsonObject.put("amosOrgId",agencyUserModel.getSequenceNbr());
+            userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(roleNameSet)).collect(Collectors.toList());
+            userRoleList.stream().forEach(r -> {
+                if (!roleIds.contains(r.getSequenceNbr())) {
+                    roleIds.add(r.getSequenceNbr());
+                }
+            });
+            roleSeqsMap.put(companyId,roleIds);
+            orgRoles.put(companyId,userRoleList);
+            agencyUserModel.setOrgRoleSeqs(roleSeqsMap);
+            agencyUserModel.setOrgRoles(orgRoles);
+            //创建用户
+            agencyUserModel = Privilege.agencyUserClient.create(agencyUserModel).getResult();
+            jsonObject.put("amosOrgId",agencyUserModel.getSequenceNbr());
+        }
+
         return orgService.dataHandling(jsonObject,bizOrgType,sequenceNbr);
     }
 }