卡片人员BUG

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -188,6 +188,9 @@
             <if test="map.peopleType != null and map.peopleType != ''">
                 AND g.peopleType = #{map.peopleType}
             </if>
+            <if test="map.fireManagementPostOne != null and map.fireManagementPostOne != ''">
+                AND locate(#{map.fireManagementPostOne}, g.fireManagementPost)
+            </if>
             <if test="map.fireManagementPost != null">
                 AND g.fireManagementPost IN
                 <foreach item="item" index="index"  collection="map.fireManagementPost" open="(" separator="," close=")">

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

@@ -603,8 +603,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		List<String> fireManagementPost;
 		if(req.containsKey("fireManagementPost")) {
 			if(StringUtils.isNotEmpty(req.get("fireManagementPost").toString())) {
-				fireManagementPost = Arrays.asList(req.get("fireManagementPost").toString().split(","));
-				map.put("fireManagementPost", fireManagementPost);
+				if(req.get("fireManagementPost").toString().indexOf(",")>-1) {
+					fireManagementPost = Arrays.asList(req.get("fireManagementPost").toString().split(","));
+					map.put("fireManagementPost", fireManagementPost);
+				} else {
+					map.put("fireManagementPostOne", req.get("fireManagementPost").toString());
+				}
 			}
 		}