更新根据id删除orgUsr表数据

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

@@ -18,6 +18,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;
@@ -154,10 +155,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/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);
     }
 }