bug修改

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

@@ -1737,7 +1737,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			throw new Exception("账号不存在");
 		}
 
-		return amosUserList.stream().map(AgencyUserModel::getUserName).collect(Collectors.toList());
+		return amosUserList.stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
 	}
 
 	@Override

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_plan.xml

@@ -124,7 +124,8 @@
 	<if test="routeId!=null"> and a.route_Id = #{routeId}</if>
 	<if test="remark!=null"> and a.remark1 like concat(concat("%",#{remark}),"%")</if>
 	<if test="userId!=null"> and FIND_IN_SET(#{userId},a.user_id)</if>
-	<if test="orgCode!=null"> and (a.org_Code like concat (#{orgCode},"-%")or a.org_Code= #{orgCode})</if>
+	<if test="orgCode!=null"> and (a.org_Code like concat (#{orgCode},"*%") or a.org_Code like concat
+		(#{orgCode},"-%") or a.org_Code= #{orgCode})</if>
 	<if test="ownerId!=null"> and b.owner_id = #{ownerId}</if>
 	<if test="planStatus!=null and planStatus != '' "> and a.`status` = #{planStatus}</if>
 	</select>
@@ -173,7 +174,8 @@
 		<if test="routeId!=null"> and a.route_Id = #{routeId}</if>
 		<if test="remark!=null"> and a.remark1 like concat(concat("%",#{remark}),"%")</if>
 		<if test="userId!=null"> and FIND_IN_SET(#{userId},a.user_id)</if>
-		<if test="orgCode!=null"> and (a.org_Code like concat (#{orgCode},"-%")or a.org_Code= #{orgCode})</if>
+		<if test="orgCode!=null"> and (a.org_Code like concat (#{orgCode},"*%") or a.org_Code like concat
+			(#{orgCode},"-%")or a.org_Code= #{orgCode})</if>
 		<if test="ownerId!=null"> and b.owner_id = #{ownerId}</if>
 		<if test="planStatus!=null and planStatus != '' "> and a.`status` = #{planStatus}</if>
 		order by a.id desc