修改注册代码

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/BaseEnterpriseMqTtlListener.java

@@ -136,7 +136,11 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
 					roleNameSet.add(unitType.getName());
 					userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName()))
 							.collect(Collectors.toList());
-					userRoleList.forEach(r -> roleIds.add(r.getSequenceNbr()));
+					for (RoleModel r : userRoleList) {
+						if (!roleIds.contains(r.getSequenceNbr())) {
+							roleIds.add(r.getSequenceNbr());
+						}
+					}
 					roleSeqMap.put(companySqr, roleIds);
 				}
 				userModel.setAppCodes(new ArrayList<>(appCodesSet));

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java

@@ -90,7 +90,6 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 	 * 单位类型，数据来源：cb_data_dictionary type = UNIT_TYPE
 	 */
 	private static String DICT_TYPE_UNIT_TYPE = "UNIT_TYPE_NEW";
-	
 
 	@Value("${org.filter.group.seq}")
 	private Long groupSeq;
@@ -266,8 +265,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 				Privilege.companyClient.queryByOrgcode(orgCode).getResult();
 				CompanyModel companyModel = JSONObject.parseObject(JSONObject.toJSONString(it.getValue()),
 						CompanyModel.class);
-				if(companyModel!=null) 
-				{
+				if (companyModel != null) {
 					companyModels = (List<CompanyModel>) Privilege.companyClient
 							.querySubAgencyTree(companyModel.getSequenceNbr()).getResult();
 				}
@@ -409,12 +407,14 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 				String[] appCodes = appCode.split(",");
 				Collections.addAll(appCodesSet, appCodes);
 				roleNameSet.add(unitType.getName());
-				userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName())).collect(Collectors.toList());
-				for (RoleModel roleModel : allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getExtend())).collect(Collectors.toList())) {
+				userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName()))
+						.collect(Collectors.toList());
+				for (RoleModel roleModel : allRoleList.stream()
+						.filter(r -> r.getRoleName().equals(unitType.getExtend())).collect(Collectors.toList())) {
 					userRoleList.add(roleModel);
 				}
 				userRoleList.forEach(r -> {
-					if(!roleIds.contains(r.getSequenceNbr())) {
+					if (!roleIds.contains(r.getSequenceNbr())) {
 						roleIds.add(r.getSequenceNbr());
 					}
 				});
@@ -428,7 +428,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 			if (userResult == null || userResult.getResult() == null) {
 				throw new BadRequest("单位注册失败");
 			}
-			String[] userIds = {userResult.getResult().getUserId()};
+			String[] userIds = { userResult.getResult().getUserId() };
 			regUnitInfo.setAdminUserId(userResult.getResult().getUserId());
 			regUnitInfo.setAmosCompanySeq(companyInfo.getSequenceNbr().toString());
 			// 3.3 org_user 创建组织机构
@@ -442,7 +442,9 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 			org.setAmosOrgId(companyInfo.getSequenceNbr() + "");
 			org.setAmosOrgCode(companyInfo.getOrgCode());
 			iOrgUsrService.save(org);
-			Privilege.groupUserClient.create(groupSeq,Arrays.asList(userIds) );
+			if (groupSeq != null) {
+				Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
+			}
 		} catch (Exception e) {
 			// 删除已经创建的 企业信息
 			if (companyInfo != null && companyInfo.getSequenceNbr() != null) {