1.检验检测开通、排期、结果录入 都去掉限制，显示所有的检验检测人员

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/CommonController.java

@@ -159,7 +159,7 @@ public class CommonController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/{unitCode}/user-list")
-    @ApiOperation(httpMethod = "GET", value = "查询指定公司、指定人员类型的人员列表", notes = "查询指定公司、指定人员类型的人员列表")
+    @ApiOperation(httpMethod = "GET", value = "查询指定公司、指定人员类型的人员列表,范围为检验、检测、检验和检测人员", notes = "查询指定公司、指定人员类型的人员列表")
     public ResponseModel<List<TzsUserInfo>> getBizUserInfosByUnitCode(@ApiParam(value = "公司编码") @PathVariable String unitCode,
                                                                       @ApiParam(value = "人员类型", allowableValues = "jy,jc") @RequestParam String personType) {
         return ResponseHelper.buildResponse(commonserviceImpl.getUserListByUnitCodeAndPost(unitCode, personType));

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

@@ -89,9 +89,14 @@ public class CommonServiceImpl {
     }
 
 
-    private void castPersonType2Post(LambdaQueryWrapper<TzsUserInfo> userInfoQueryWrapper, String personType) {
+    public void castPersonType2Post(LambdaQueryWrapper<TzsUserInfo> userInfoQueryWrapper, String personType) {
+
+        if (personType.contains(OpenBizTypeEnum.JY.getCode()) && personType.contains(OpenBizTypeEnum.JC.getCode())) {
+            userInfoQueryWrapper.and(w-> w.like(TzsUserInfo::getPost, jyUserPost).or().like(TzsUserInfo::getPost, jcUserPost));
+            return;
+        }
         if (personType.equals(OpenBizTypeEnum.JY.getCode())) {
-            userInfoQueryWrapper.like(TzsUserInfo::getPost, jyUserPost);
+            userInfoQueryWrapper.like(TzsUserInfo::getPost, jcUserPost);
         }
         if (personType.equals(OpenBizTypeEnum.JC.getCode())) {
             userInfoQueryWrapper.like(TzsUserInfo::getPost, jcUserPost);

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

@@ -405,7 +405,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             // 设置检验、检测资质信息
             setBaseUnitLicences(unitCode, jyjcOpeningApplicationModel, true);
             // 设置检验、检测人员信息
-            setJYJCUserList(unitCode, jyjcOpeningApplicationModel, true, jyjcOpeningApplicationModel.getOpenBizType());
+            setJYJCUserList(unitCode, jyjcOpeningApplicationModel, false, jyjcOpeningApplicationModel.getOpenBizType());
         } else {
             jyjcOpeningApplicationModel = new JyjcOpeningApplicationModel();
             jyjcOpeningApplicationModel.setResultType("input");
@@ -491,12 +491,12 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         LambdaQueryWrapper<TzsUserInfo> userInfoQueryWrapper = new LambdaQueryWrapper<>();
         userInfoQueryWrapper.eq(TzsUserInfo::getUnitCode, unitCode);
         userInfoQueryWrapper.eq(BaseEntity::getIsDelete, false);
-        this.castPersonType2Post(userInfoQueryWrapper, openBizType);
+        commonService.castPersonType2Post(userInfoQueryWrapper, openBizType);
         List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper);
         if (!ValidationUtil.isEmpty(userInfos)) {
             List<TzsUserInfoVo> tzsUserInfoVos = userInfos.stream().map(userInfo -> {
                 TzsUserInfoVo vo = new TzsUserInfoVo();
-                BeanUtils.copyProperties(userInfo, vo, "identification", "profile", "permissionItem", "appointDoc");
+                BeanUtils.copyProperties(userInfo, vo, "identification", "profile", "permissionItem", "appointDoc", "permissionData");
                 this.setPermissionInfo(vo, userInfo, openBizType);
                 if (!ObjectUtils.isEmpty(userInfo.getPost())) {
                     vo.setPost(JSON.parseArray(userInfo.getPost()));
@@ -529,24 +529,21 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         }
     }
 
-    private void castPersonType2Post(LambdaQueryWrapper<TzsUserInfo> userInfoQueryWrapper, String personType) {
-        if (personType.equals(OpenBizTypeEnum.JY.getCode())) {
-            userInfoQueryWrapper.like(TzsUserInfo::getPost, jyUserPost);
-        }
-        if (personType.equals(OpenBizTypeEnum.JC.getCode())) {
-            userInfoQueryWrapper.like(TzsUserInfo::getPost, jcUserPost);
-        }
-    }
-
     public List<TzsUserInfoVo> getUserListByUnitCodeAndPost(String unitCode, String personType) {
         LambdaQueryWrapper<TzsUserInfo> userInfoQueryWrapper = new LambdaQueryWrapper<>();
         userInfoQueryWrapper.eq(TzsUserInfo::getUnitCode, unitCode);
-        this.castPersonType2Post(userInfoQueryWrapper, personType);
+        commonService.castPersonType2Post(userInfoQueryWrapper, personType);
         userInfoQueryWrapper.eq(BaseEntity::getIsDelete, false);
         List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper);
+        String appKey = RequestContext.getAppKey();
+        String product = RequestContext.getProduct();
+        String token = RequestContext.getToken();
         return userInfos.parallelStream().map(userInfo -> {
             TzsUserInfoVo vo = new TzsUserInfoVo();
-            BeanUtils.copyProperties(userInfo, vo, "identification", "profile", "permissionItem", "appointDoc");
+            BeanUtils.copyProperties(userInfo, vo, "identification", "profile", "permissionItem", "appointDoc", "permissionData");
+            RequestContext.setAppKey(appKey);
+            RequestContext.setProduct(product);
+            RequestContext.setToken(token);
             this.setPermissionInfo(vo, userInfo, personType);
             if (!ObjectUtils.isEmpty(userInfo.getNewPost())) {
                 vo.setPost(JSON.parseArray(userInfo.getNewPost()));
@@ -559,7 +556,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     }
 
     private void setPermissionInfo(TzsUserInfoVo vo, TzsUserInfo userInfo, String personType) {
-        String post = "";
+        String post = "6615";
         if (personType.equals(OpenBizTypeEnum.JY.getCode())) {
             post = jyUserPost;
         }

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

@@ -69,6 +69,6 @@
             "tzs_user_permission"
         where
             user_seq = #{userSeq}
-            and permission_post = #{permissionPost}
+            and permission_post like concat(#{permissionPost}, '%')
     </select>
 </mapper>
\ No newline at end of file