修改人员删除

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -392,7 +392,7 @@ public class OrgPersonController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/peopleSave", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增人员", notes = "新增人员默认创建消防人员")
     public ResponseModel<PeopleInfoDto> peopleSave(@RequestBody PeopleInfoDto peopleInfoDto) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -3062,7 +3062,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				agencyUserModel.setPassword(peopleInfoDto.getOrgUsrAgencyUser().getPassword());
 				agencyUserModel.setRePassword(peopleInfoDto.getOrgUsrAgencyUser().getPassword());
 			}
-			userResult = Privilege.agencyUserClient.update(agencyUserModel, peopleInfoDto.getFirefighters().getUserId()).getResult();
+			userResult = Privilege.agencyUserClient.update(agencyUserModel, peopleInfoDto.getOrgUsrAgencyUser().getAmosUserId()).getResult();
 		}
 		//绑定用户组
 		String groupIds = peopleInfoDto.getOrgUsrAgencyUser().getGroupIds();
@@ -3086,7 +3086,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 //				orgUsrAgencyUser.setUserName("测试");
 				orgUsrAgencyUserMapper.insert(orgUsrAgencyUser);
 			} else {
-				orgUsrAgencyUserMapper.update(orgUsrAgencyUser,new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id",orgUsr.getSequenceNbr()));
+				orgUsrAgencyUserMapper.update(orgUsrAgencyUser,new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id",peopleInfoDto.getFirefighters().getSequenceNbr()));
 			}
 		}
 		resultMap.put("orgCode",result1.get("compnay").get("orgCode").toString());
@@ -3393,14 +3393,15 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				CommonConstant.IS_DELETE_01));
 		//删除cb_org_usr_agency_user中对应数据
 		OrgUsr orgUsr = orgUsrMapper.queryByUserId(id);
-		if (!ObjectUtils.isEmpty(orgUsr)) {
-			orgUsrMapper.deleteById(id);
+		OrgUsrAgencyUser orgUsrAgencyUser = orgUsrAgencyUserMapper.selectOne(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
+		if (!ObjectUtils.isEmpty(orgUsrAgencyUser)) {
+			orgUsrAgencyUserMapper.delete(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
 		}
 
 		//同步平台删除用户
-		AgencyUserModel amosUser = Privilege.agencyUserClient.queryByUserId(id.toString()).getResult();
+		AgencyUserModel amosUser = Privilege.agencyUserClient.queryByUserId(orgUsrAgencyUser.getAmosUserId()).getResult();
 		if (!ObjectUtils.isEmpty(amosUser)) {
-			Privilege.agencyUserClient.multDeleteUser(id.toString());
+			Privilege.agencyUserClient.multDeleteUser(orgUsrAgencyUser.getAmosUserId());
 		}
 		/* bug 2812 一次删除多条数据 传入类型修改为string 问题解决 2021-09-09 陈召 结束 */
 		try {

amos-boot-system-jcs/src/main/resources/application-dev.properties

@@ -26,7 +26,7 @@ elasticsearch.password= 123456
 ## emqx properties:
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.11.201:2883
+emqx.broker=tcp://172.16.11.201:1883
 emqx.user-name=admin
 emqx.password=public