fix(tcm):1，人员查询bug

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzsUserInfoDto.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 用户信息
@@ -115,5 +116,5 @@ public class TzsUserInfoDto extends BaseDto {
     private String menuType;
 
     @ApiModelProperty(value = "菜单类型下的所有人员类型")
-    private String menuTypeUnderPost;
+    private List<String> menuTypeUnderPost;
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsUserInfoMapper.xml

@@ -47,8 +47,12 @@
             <if test="dto.amosUserName != '' and dto.amosUserName != null">
                 and amos_user_name like concat('%',#{dto.amosUserName},'%')
             </if>
-            <if test="dto.menuTypeUnderPost != '' and dto.menuTypeUnderPost != null">
-                and post::jsonb <![CDATA[@>]]> #{dto.menuTypeUnderPost}::jsonb
+            <if test="dto.menuTypeUnderPost != null and dto.menuTypeUnderPost.size() > 0">
+                AND (
+                <foreach collection="dto.menuTypeUnderPost" separator="or" item="postType">
+                    post like concat('%',#{postType},'%')
+                </foreach>
+                )
             </if>
             <if test="dto.postName != '' and dto.postName != null">
                 and post like concat('%',#{dto.postName},'%')

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

@@ -124,7 +124,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
 
     @Override
     public Page<TzsUserInfoDto> page(TzsUserInfoDto dto, Page<TzsUserInfoDto> page) {
-        dto.setMenuTypeUnderPost(JSON.toJSONString(menuMap.get(dto.getMenuType())));
+        dto.setMenuTypeUnderPost(menuMap.get(dto.getMenuType()));
         Page<TzsUserInfoDto> tzsUserInfoDtoPage = tzsUserInfoMapper.selectPageMessage(page, dto);
         tzsUserInfoDtoPage.getRecords().forEach(item -> {
             if (!ObjectUtils.isEmpty(item.getProfile())) {
@@ -780,6 +780,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         tzsUserInfo.setRecDate(new Date());
         // 兼容前端只传一个值，并且非json类型的情况
         JSONArray postArray = JSONArray.parseArray(this.isJSONValid(tzsUserInfo.getPost()) ? tzsUserInfo.getPost() : "[\"" + tzsUserInfo.getPost() + "\"]");
+        tzsUserInfo.setNewPost(JSONArray.toJSONString(postArray));
         // 兼容 人员类型为【作业人员】且 【作业项目】含有【电梯修理】项目的为【维保人员】post为“6618”
         JSONArray permissionData6552 = tzsUserInfo.getPermissionData6552();
         if (!permissionData6552.isEmpty() && postArray.contains("6552")) {
@@ -790,7 +791,6 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             }
         }
         tzsUserInfo.setPost(JSONArray.toJSONString(postArray));
-        tzsUserInfo.setNewPost(JSONArray.toJSONString(postArray));
         tzsUserInfo.setPostName(this.setPostName(tzsUserInfo.getPost()));
         tzsUserInfo = this.createWithModel(tzsUserInfo);
         // 保存资质
@@ -843,6 +843,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         tzsUserInfoDto.setRecDate(new Date());
         // 兼容前端只传一个值，并且非json类型的情况
         JSONArray postArray = JSONArray.parseArray(this.isJSONValid(tzsUserInfoDto.getPost()) ? tzsUserInfoDto.getPost() : "[\"" + tzsUserInfoDto.getPost() + "\"]");
+        tzsUserInfoDto.setNewPost(JSONArray.toJSONString(postArray));
         // 兼容 人员类型为【作业人员】且 【作业项目】含有【电梯修理】项目的为【维保人员】post为“6618”
         JSONArray permissionData6552 = tzsUserInfoDto.getPermissionData6552();
         if (!permissionData6552.isEmpty() && postArray.contains("6552")) {
@@ -853,7 +854,6 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             }
         }
         tzsUserInfoDto.setPost(JSONArray.toJSONString(postArray));
-        tzsUserInfoDto.setNewPost(JSONArray.toJSONString(postArray));
         String postName = this.setPostName(tzsUserInfoDto.getPost());
         tzsUserInfoDto.setPostName(postName);
         if (!ObjectUtils.isEmpty(selectOne.getAmosUserId())) {