拦截器放行一些接口

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -83,10 +83,15 @@ public class ControllerAop {
 		// 不需要添加请求头的接口
 		String[] url = new String[] { "/api/user/save/curCompany", "/jcs/command/lookHtmlText",
 				"/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/elevator/getElevatorInfo",
-				"/openapi/bizToken/applyToken","/tzs/flc-unit-info/region/tree","/tzs/reg-unit-info/management-unit/tree",
-				"/tzs/reg-unit-info/unit-type/list","/tzs/reg-unit-info/*"
+				"/openapi/bizToken/applyToken"
+				,"/tzs/flc-unit-info/region/tree"
+				// ,"/tzs/reg-unit-info/management-unit/tree",
+				//"/tzs/reg-unit-info/unit-type/list"
 				//+ ",/tzs/reg-unit-info/management-unit/tree","/tzs/flc-unit-info/region/tree", "/tzs/reg-unit-info/unit-type/list"
-				};
+		};
+		if (request.getRequestURI().contains("/tzs/reg-unit-info")  || request.getRequestURI().contains("/tzs/flc-unit-info")) {
+			return;
+		}
 		// 获取请求路径
 		for (String uri : url) {
 			if (request.getRequestURI().indexOf(uri) != -1) {

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

@@ -606,7 +606,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 				userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName()))
 						.collect(Collectors.toList());
 				for (RoleModel roleModel : allRoleList.stream()
-						.filter(r -> r.getSequenceNbr().toString().contains(unitType.getExtend())).collect(Collectors.toList())) {
+						.filter(r -> unitType.getExtend().contains(r.getSequenceNbr().toString())).collect(Collectors.toList())) {
 					userRoleList.add(roleModel);
 				}
 				userRoleList.forEach(r -> {