fix(tcm):人员添加，修改 接口兼容作业人员和维修人员

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

@@ -63,19 +63,6 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
     // 平台用户锁定状态
     private final String UNLOCK = "UNLOCK";
     private final String LOCK = "LOCK";
-
-    /**
-     * 检验人员资质类型
-     */
-    private final String JYRY_TYPE = "permissionData66151";
-    /**
-     * 检测人员资质类型
-     */
-    private final String JCRY_TYPE = "permissionData66152";
-    /**
-     * 工作人员资质类型
-     */
-    private final String ZYRY_TYPE = "permissionData6552";
     @Autowired
     DataDictionaryServiceImpl iDataDictionaryService;
     @Autowired
@@ -764,9 +751,18 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         tzsUserInfo.setAppointDoc(tzsUserInfo.getAppointDoc());
         tzsUserInfo.setRecDate(new Date());
         // 兼容前端只传一个值，并且非json类型的情况
-        String post = this.isJSONValid(tzsUserInfo.getPost()) ? tzsUserInfo.getPost() : "[\"" + tzsUserInfo.getPost() + "\"]";
-        tzsUserInfo.setPost(post);
-        tzsUserInfo.setNewPost(post);
+        JSONArray postArray = JSONArray.parseArray(this.isJSONValid(tzsUserInfo.getPost()) ? tzsUserInfo.getPost() : "[\"" + tzsUserInfo.getPost() + "\"]");
+        // 兼容 人员类型为【作业人员】且 【作业项目】含有【电梯修理】项目的为【维保人员】post为“6618”
+        JSONArray permissionData6552 = tzsUserInfo.getPermissionData6552();
+        if (!permissionData6552.isEmpty() && postArray.contains("6552")) {
+            JSONObject jsonObject = permissionData6552.getJSONObject(0);
+            JSONArray jobItem = jsonObject.getJSONArray("jobItem");
+            if (jobItem != null && jobItem.contains("电梯修理")) {
+                postArray.add("6618");
+            }
+        }
+        tzsUserInfo.setPost(JSONArray.toJSONString(postArray));
+        tzsUserInfo.setNewPost(JSONArray.toJSONString(postArray));
         tzsUserInfo.setPostName(this.setPostName(tzsUserInfo.getPost()));
         tzsUserInfo = this.createWithModel(tzsUserInfo);
         // 保存资质
@@ -818,9 +814,18 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         tzsUserInfoDto.setSequenceNbr(rowId);
         tzsUserInfoDto.setRecDate(new Date());
         // 兼容前端只传一个值，并且非json类型的情况
-        String post = this.isJSONValid(tzsUserInfoDto.getPost()) ? tzsUserInfoDto.getPost() : "[\"" + tzsUserInfoDto.getPost() + "\"]";
-        tzsUserInfoDto.setPost(post);
-        tzsUserInfoDto.setNewPost(post);
+        JSONArray postArray = JSONArray.parseArray(this.isJSONValid(tzsUserInfoDto.getPost()) ? tzsUserInfoDto.getPost() : "[\"" + tzsUserInfoDto.getPost() + "\"]");
+        // 兼容 人员类型为【作业人员】且 【作业项目】含有【电梯修理】项目的为【维保人员】post为“6618”
+        JSONArray permissionData6552 = tzsUserInfoDto.getPermissionData6552();
+        if (!permissionData6552.isEmpty() && postArray.contains("6552")) {
+            JSONObject jsonObject = permissionData6552.getJSONObject(0);
+            JSONArray jobItem = jsonObject.getJSONArray("jobItem");
+            if (jobItem != null && jobItem.contains("电梯修理")) {
+                postArray.add("6618");
+            }
+        }
+        tzsUserInfoDto.setPost(JSONArray.toJSONString(postArray));
+        tzsUserInfoDto.setNewPost(JSONArray.toJSONString(postArray));
         String postName = this.setPostName(tzsUserInfoDto.getPost());
         tzsUserInfoDto.setPostName(postName);
         if (!ObjectUtils.isEmpty(selectOne.getAmosUserId())) {

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/TzsUserPermissionServiceImpl.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -49,7 +50,7 @@ public class TzsUserPermissionServiceImpl extends BaseService<TzsUserPermissionD
     /**
      * 需要转换的附件字段 jsonString化字段
      */
-    private final String[] ATTACHMENTS = {"certAttachment", "otherItem", "itemCode"};
+    private final String[] ATTACHMENTS = {"certAttachment", "otherItem", "itemCode","permissionItem"};
 
     /**
      * 分页查询
@@ -116,7 +117,7 @@ public class TzsUserPermissionServiceImpl extends BaseService<TzsUserPermissionD
         TzsUserPermission permission = new TzsUserPermission();
         permission.setUserSeq(userInfo.getSequenceNbr());
         permission.setPermissionLevel(!ZYRY_TYPE.equals(type) ? (String) permissionData.get("permissionLevel") : null);
-        permission.setPermissionItem(!ZYRY_TYPE.equals(type) ? JSONArray.toJSONString(permissionData.get("permissionItem")) : null);
+        permission.setPermissionItem(!ZYRY_TYPE.equals(type) ? JSONObject.toJSONString(permissionData.get("permissionItem"), SerializerFeature.WriteMapNullValue, SerializerFeature.DisableCircularReferenceDetect) : null);
         permission.setPermissionPost(type);
         permission.setCertNo((String) permissionData.get("certNo"));