修改人员bug 10327

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

@@ -241,15 +241,12 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 			//删除之前所在用户组
 			OrgUsrAgencyUser orgUsrAgencyUser = orgUsrAgencyUserMapper.selectOne(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
 			if (!ValidationUtil.isEmpty(orgUsrAgencyUser) && amosUser != null ) {
-
-				List<String> groupIdsList = peopleInfoDto.getOrgUsrAgencyUser().getDataDictionaryList().stream().map(DataDictionary::getCode).distinct().collect(Collectors.toList());
-				String groupIds = String.join(",", groupIdsList);
-				if (!"".equals(groupIds) && null != groupIds) {
-					String[] ids = groupIds.split(",");
-					for (String gId : ids) {
-						Long groupId = Long.valueOf(gId);
-						Privilege.groupUserClient.deleteGroupUser(groupId,amosUser.getUserId());
-					}
+				for (String s : orgUsrAgencyUser.getGroupIds().split(",")) {
+					QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+					queryWrapper.eq("name", s);
+					queryWrapper.eq("type", "CB_USER_GROUP");
+					List<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+					Privilege.groupUserClient.deleteGroupUser(Long.valueOf(list.get(0).getCode()),amosUser.getUserId());
 				}
 			}
 			//同步更新或者创建平台用户
@@ -260,18 +257,23 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 					//删除cb_org_usr_agency_user中对应数据
 					if (!ValidationUtil.isEmpty(orgUsrAgencyUser)) {
 						orgUsrAgencyUserMapper.delete(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
+						Privilege.agencyUserClient.multDeleteUser(orgUsrAgencyUser.getAmosUserId());
 					}
 					//删除cb_org_usr相关字段
 					OrgUsr orgUsr1 = orgUsrMapper.queryBySequenceNbr(id.toString());
-					orgUsr1.setAmosOrgId("");
-					orgUsr1.setAmosOrgCode("");
-					orgUsrMapper.update(orgUsr1,new QueryWrapper<OrgUsr>().eq("sequence_nbr",id));
+					if(!ValidationUtil.isEmpty(orgUsr1)){
+						orgUsr1.setAmosOrgId("");
+						orgUsr1.setAmosOrgCode("");
+						orgUsrMapper.update(orgUsr1,new QueryWrapper<OrgUsr>().eq("sequence_nbr",id));
+					}
+
 					//删除cb_firefighters相关字段
 					Firefighters firefighters = firefightersMapper.selectOne(new QueryWrapper<Firefighters>().eq("org_usr_id", id));
-					firefighters.setAmosUserId("");
-					firefighters.setAmosName("");
-					firefightersMapper.update(firefighters,new QueryWrapper<Firefighters>().eq("org_usr_id", id));
-					Privilege.agencyUserClient.multDeleteUser(orgUsrAgencyUser.getAmosUserId());
+					if(!ValidationUtil.isEmpty(firefighters)){
+						firefighters.setAmosUserId("");
+						firefighters.setAmosName("");
+						firefightersMapper.update(firefighters,new QueryWrapper<Firefighters>().eq("org_usr_id", id));
+					}
 				} else {
 					map = orgUsrService.savePlatformUser(orgUsr,peopleInfoDto,"update");
 				}