20221108_sun加密后端+补贴前端

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/impl/ZwywBtglJewhServiceImpl.java

@@ -73,7 +73,7 @@ public class ZwywBtglJewhServiceImpl implements IZwywBtglJewhService
     public List<Map<String, Object>> selectLrList() {
         List<Map<String, Object>> Lrlist = zwywBtglJewhMapper.selectLrList();
          Lrlist.forEach(r->{
-             EncryptionUtils.encryptionMap(r, ZwywBtglLrqdmx.class);
+             EncryptionUtils.encryptionMap(r, new ZwywBtglLrqdmx());
              Map<String, Object> map = sysDeptJlMapper.selectJlDeptByParams(null, r.get("ffdq").toString());
              if (ObjectUtils.isNotEmpty(map)) {
                  r.put("xzqhIds", sysDeptJlMapper.getXzqhIds(map.get(SysDeptJlStatus.CODE.getCode()).toString()));

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/domain/DjpdSq.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.system.validate.DictV;
 import com.ruoyi.system.validate.EncryptionV;
+import com.ruoyi.system.validate.group.AddGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -51,20 +52,20 @@ public class DjpdSq extends BaseEntity
     /** 统一社会信用代码 */
     @Excel(name = "统一社会信用代码")
     @ApiModelProperty(value = "统一社会信用代码", required = true)
-    @NotBlank(message = "{统一社会信用代码}")
+    @NotBlank(message = "{统一社会信用代码}",groups = AddGroup.class)
     @Size(min  = 1, max = 18, message = "{统一社会信用代码}")
     private String xydm;
 
     /** 单位名称 */
     @Excel(name = "单位名称")
     @ApiModelProperty(value = "单位名称", required = true)
-    @NotBlank(message = "{单位名称}")
+    @NotBlank(message = "{单位名称}",groups = AddGroup.class)
     @Size(min  = 1, max = 100, message = "{单位名称}")
     private String dwmc;
 
     /** 单位建立日期 */
     @ApiModelProperty(value = "单位建立日期", required = true)
-    @NotBlank(message = "{单位建立日期}")
+    @NotBlank(message = "{单位建立日期}",groups = AddGroup.class)
     @Size(min  = 1, max = 8, message = "{单位建立日期}")
     private String jlrq;
 
@@ -85,7 +86,7 @@ public class DjpdSq extends BaseEntity
     /** 所在行政区划主键标识 */
     @Excel(name = "所在行政区划主键标识")
     @ApiModelProperty(value = "所在行政区划主键标识", required = true)
-    @NotBlank(message = "{所在行政区划主键标识}")
+    @NotBlank(message = "{所在行政区划主键标识}",groups = AddGroup.class)
     private String szxzqhId;
 
     /** 养老机构执业日期 */
@@ -96,135 +97,135 @@ public class DjpdSq extends BaseEntity
 
     /** 单位通信地址 */
     @ApiModelProperty(value = "单位通信地址", required = true)
-    @NotBlank(message = "{单位通信地址}")
+    @NotBlank(message = "{单位通信地址}",groups = AddGroup.class)
     @Size(min  = 1, max = 100, message = "{单位通信地址}")
     @EncryptionV
     private String txdz;
 
     /** 机构联系人姓名 */
     @ApiModelProperty(value = "机构联系人姓名", required = true)
-    @NotBlank(message = "{机构联系人姓名}")
+    @NotBlank(message = "{机构联系人姓名}",groups = AddGroup.class)
     @Size(min  = 1, max = 72, message = "{机构联系人姓名}")
     @EncryptionV
     private String jglxrxm;
 
     /** 机构负责人姓名 */
     @ApiModelProperty(value = "机构负责人姓名", required = true)
-    @NotBlank(message = "{机构负责人姓名}")
+    @NotBlank(message = "{机构负责人姓名}",groups = AddGroup.class)
     @Size(min  = 1, max = 72, message = "{机构负责人姓名}")
     @EncryptionV
     private String jgfzrxm;
 
     /** 机构负责人联系电话 */
     @ApiModelProperty(value = "机构负责人联系电话", required = true)
-    @NotBlank(message = "{机构负责人联系电话}")
+    @NotBlank(message = "{机构负责人联系电话}",groups = AddGroup.class)
     @Size(min  = 1, max = 18, message = "{机构负责人联系电话}")
     @EncryptionV
     private String jgfzrlxdh;
 
     /** 法人姓名 */
     @ApiModelProperty(value = "法人姓名", required = true)
-    @NotBlank(message = "{法人姓名}")
+    @NotBlank(message = "{法人姓名}",groups = AddGroup.class)
     @Size(min  = 1, max = 72, message = "{法人姓名}")
     @EncryptionV
     private String frxm;
 
     /** 法人证件类型（C0015） */
     @ApiModelProperty(value = "法人证件类型（C0015）", required = true)
-    @NotBlank(message = "{法人证件类型}")
+    @NotBlank(message = "{法人证件类型}",groups = AddGroup.class)
     @DictV(type = "C0015",message = "{法人证件类型}")
     private String frzjlx;
 
     /** 法人证件号码 */
     @ApiModelProperty(value = "法人证件号码", required = true)
-    @NotBlank(message = "{法人证件号码}")
+    @NotBlank(message = "{法人证件号码}",groups = AddGroup.class)
     @Size(min  = 1, max = 18, message = "{法人证件号码}")
     @EncryptionV
     private String frzjhm;
 
     /** 法人联系电话 */
     @ApiModelProperty(value = "法人联系电话", required = true)
-    @NotBlank(message = "{法人联系电话}")
+    @NotBlank(message = "{法人联系电话}",groups = AddGroup.class)
     @Size(min  = 1, max = 11, message = "{法人联系电话}")
     @EncryptionV
     private String frlxfs;
 
     /** 法人登记机关 */
     @ApiModelProperty(value = "法人登记机关", required = true)
-    @NotBlank(message = "{法人登记机关}")
+    @NotBlank(message = "{法人登记机关}",groups = AddGroup.class)
     @Size(min  = 1, max = 72, message = "{法人登记机关}")
     private String frdjjg;
 
     /** 法人性质（CH007） */
     @ApiModelProperty(value = "法人性质（CH007）", required = true)
-    @NotBlank(message = "{法人性质}")
+    @NotBlank(message = "{法人性质}",groups = AddGroup.class)
     @DictV(type = "CH007",message = "{法人性质}")
     private String frxz;
 
     /** 服务场所性质（CH009） */
     @ApiModelProperty(value = "服务场所性质（CH009）", required = true)
-    @NotBlank(message = "{服务场所性质}")
+    @NotBlank(message = "{服务场所性质}",groups = AddGroup.class)
     @DictV(type = "CH009",message = "{服务场所性质}")
     private String fwcsxz;
 
     /** 所处位置（CH012） */
     @ApiModelProperty(value = "所处位置（CH012）", required = true)
-    @NotBlank(message = "{所处位置}")
+    @NotBlank(message = "{所处位置}",groups = AddGroup.class)
     @DictV(type = "CH012",message = "{所处位置}")
     private String scwz;
 
     /** 全托床位数 */
     @ApiModelProperty(value = "全托床位数", required = true)
-    @NotBlank(message = "{所在行政区划主键标识}")
+    @NotBlank(message = "{所在行政区划主键标识}",groups = AddGroup.class)
     @Size(min  = 1, max = 11, message = "{所在行政区划主键标识}")
     private String qtcw;
 
     /** 日托床位数量 */
     @ApiModelProperty(value = "日托床位数量", required = true)
-    @NotBlank(message = "{日托床位数量}")
+    @NotBlank(message = "{日托床位数量}",groups = AddGroup.class)
     @Size(min  = 1, max = 11, message = "{日托床位数量}")
     private String rtcw;
 
     /** 护理床位数量 */
     @ApiModelProperty(value = "护理床位数量", required = true)
-    @NotBlank(message = "{护理床位数量}")
+    @NotBlank(message = "{护理床位数量}",groups = AddGroup.class)
     @Size(min  = 1, max = 11, message = "{护理床位数量}")
     private String hlcw;
 
     /** 收住老年人类型（CH052） */
     @ApiModelProperty(value = "收住老年人类型（CH052）", required = true)
-    @NotBlank(message = "{收住老年人类型}")
+    @NotBlank(message = "{收住老年人类型}",groups = AddGroup.class)
     @DictV(type = "CH052", isMuti = true, message = "{收住老年人类型}")
     private String szlx;
 
     /** 服务设施面积 */
     @ApiModelProperty(value = "服务设施面积", required = true)
-    @NotBlank(message = "{服务设施面积}")
+    @NotBlank(message = "{服务设施面积}",groups = AddGroup.class)
     @Size(min  = 1, max = 11, message = "{服务设施面积}")
     private String ssmj;
 
     /** 建筑面积 */
     @ApiModelProperty(value = "建筑面积", required = true)
-    @NotBlank(message = "{建筑面积}")
+    @NotBlank(message = "{建筑面积}",groups = AddGroup.class)
     @Size(min  = 1, max = 11, message = "{建筑面积}")
     private String jzmj;
 
     /** 占地面积 */
     @ApiModelProperty(value = "占地面积", required = true)
-    @NotBlank(message = "{占地面积}")
+    @NotBlank(message = "{占地面积}",groups = AddGroup.class)
     @Size(min  = 1, max = 11, message = "{占地面积}")
     private String zdmj;
 
     /** 机构联系电话 */
     @ApiModelProperty(value = "机构联系电话", required = true)
-    @NotBlank(message = "{机构联系电话}")
+    @NotBlank(message = "{机构联系电话}",groups = AddGroup.class)
     @Size(min  = 1, max = 18, message = "{机构联系电话}")
     @EncryptionV
     private String jglxdh;
 
     /** 是否区域养老中心（CZ035） */
     @ApiModelProperty(value = "是否区域养老中心（CZ035）", required = true)
-    @NotBlank(message = "{是否区域养老中心}")
+    @NotBlank(message = "{是否区域养老中心}",groups = AddGroup.class)
     @DictV(type = "CZ035",message = "{是否区域养老中心}")
     private String isQyylzx;
 
@@ -235,13 +236,13 @@ public class DjpdSq extends BaseEntity
 
     /** 是否投保责任险（CZ035） */
     @ApiModelProperty(value = "是否投保责任险（CZ035）", required = true)
-    @NotBlank(message = "{是否投保责任险}")
+    @NotBlank(message = "{是否投保责任险}",groups = AddGroup.class)
     @DictV(type = "CZ035",message = "{是否投保责任险}")
     private String isTbzrx;
 
     /** 是否提供居家上门服务（CZ035） */
     @ApiModelProperty(value = "是否提供居家上门服务（CZ035）", required = true)
-    @NotBlank(message = "{是否提供居家上门服务}")
+    @NotBlank(message = "{是否提供居家上门服务}",groups = AddGroup.class)
     @DictV(type = "CZ035",message = "{是否提供居家上门服务}")
     private String isSmfw;
 
@@ -259,27 +260,27 @@ public class DjpdSq extends BaseEntity
 
     /** 是否符合基本条件和要求（CZ035） */
     @ApiModelProperty(value = "是否符合基本条件和要求（CZ035）", required = true)
-    @NotBlank(message = "{是否符合基本条件和要求}")
+    @NotBlank(message = "{是否符合基本条件和要求}",groups = AddGroup.class)
     @DictV(type = "CZ035",message = "{是否符合基本条件和要求}")
     private String isFhyq;
 
     /** 申请等级（CZ012） */
     @Excel(name = "申请等级", dictType = "CZ012")
     @ApiModelProperty(value = "申请等级（CZ012）", required = true)
-    @NotBlank(message = "{申请等级}")
+    @NotBlank(message = "{申请等级}",groups = AddGroup.class)
     @DictV(type = "CZ012",message = "{申请等级}")
     private String sqdj;
 
     /** 申请人姓名 */
     @ApiModelProperty(value = "申请人姓名", required = true)
-    @NotBlank(message = "{申请人姓名}")
+    @NotBlank(message = "{申请人姓名}",groups = AddGroup.class)
     @Size(min  = 1, max = 72, message = "{申请人姓名}")
     @EncryptionV
     private String sqrxm;
 
     /** 申请人联系电话 */
     @ApiModelProperty(value = "申请人联系电话", required = true)
-    @NotBlank(message = "{申请人联系电话}")
+    @NotBlank(message = "{申请人联系电话}",groups = AddGroup.class)
     @Size(min  = 1, max = 18, message = "{申请人联系电话}")
     @EncryptionV
     private String sqrlxdh;
@@ -287,7 +288,7 @@ public class DjpdSq extends BaseEntity
     /** 申请日期 */
     @Excel(name = "申请日期")
     @ApiModelProperty(value = "申请日期", required = true)
-    @NotBlank(message = "{申请日期}")
+    @NotBlank(message = "{申请日期}",groups = AddGroup.class)
     @Size(min  = 1, max = 14, message = "{申请日期}")
     private String sqsj;
 

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/domain/ZwywBgdjpdSq.java

@@ -139,4 +139,16 @@ public class ZwywBgdjpdSq extends BaseEntity
 
     @TableField(exist = false)
     private String ly;
+
+    @TableField(exist = false)
+    @EncryptionV
+    private String txdz;
+
+    @TableField(exist = false)
+    @EncryptionV
+    private String jglxrxm;
+
+    @TableField(exist = false)
+    @EncryptionV
+    private String jglxdh;
 }

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/service/impl/DjpdSqServiceImpl.java

@@ -685,7 +685,7 @@ public class DjpdSqServiceImpl implements IDjpdSqService
         ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery()
                 .orderByProcessDefinitionId().orderByProcessDefinitionVersion().desc();
         processDefinitionQuery.processDefinitionKey(WorkFlowStatus.DJPD.getCode() + "_" + SecurityUtils.getAreaCode());
-        if (processDefinitionQuery.count() > 0) {
+        if (processDefinitionQuery.count() > 0 && !processDefinitionQuery.singleResult().isSuspended()) {
             ProcessInstance processInstance = runtimeService
                     .startProcessInstanceByKey(WorkFlowStatus.DJPD.getCode() + "_" + SecurityUtils.getAreaCode(), id);
             djpdSq.setInstanceId(processInstance.getId());
@@ -694,7 +694,7 @@ public class DjpdSqServiceImpl implements IDjpdSqService
             ProcessDefinitionQuery processDefinitionQueryCity = repositoryService.createProcessDefinitionQuery()
                     .orderByProcessDefinitionId().orderByProcessDefinitionVersion().desc();
             processDefinitionQueryCity.processDefinitionKey(WorkFlowStatus.DJPD.getCode() + "_" + cityAreaCode);
-            if (processDefinitionQueryCity.count() > 0) {
+            if (processDefinitionQueryCity.count() > 0 && !processDefinitionQueryCity.singleResult().isSuspended()) {
                 ProcessInstance processInstance = runtimeService
                         .startProcessInstanceByKey(WorkFlowStatus.DJPD.getCode() + "_" + cityAreaCode, id);
                 djpdSq.setInstanceId(processInstance.getId());
@@ -737,13 +737,15 @@ public class DjpdSqServiceImpl implements IDjpdSqService
     public Map<String, Object> selectJgByXydm(YljgJcxx xydm) {
         Map<String, Object> res = djpdSqMapper.selectJgByXydm(xydm.getId());
         if (ObjectUtils.isNotEmpty(res)) {
-            EncryptionUtils.encryptionMap(res, DjpdSq.class);
+            EncryptionUtils.encryptionMap(res, new YljgJcxx());
             LambdaQueryWrapper<DjpdSq> lqw = new LambdaQueryWrapper<DjpdSq>()
-                    .eq(DjpdSq::getJgId, res.get(SysDeptJlStatus.ID.getCode()));
+                    .eq(DjpdSq::getJgId, res.get(SysDeptJlStatus.ID.getCode()))
+                    .isNotNull(DjpdSq::getPddj);
             Optional<DjpdSq> lastSq = djpdSqMapper.selectList(lqw).stream().max(Comparator.comparing(DjpdSq::getCreateTimeStr));
             if (lastSq.isPresent()) {
                 res.put(SysDeptJlStatus.LASTPDDJ.getCode(), lastSq.get().getPddj());
                 res.put(SysDeptJlStatus.LASTSQDJ.getCode(), lastSq.get().getSqdj());
+                res.put(SysDeptJlStatus.SQID.getCode(), lastSq.get().getId());
             } else {
                 res.put(SysDeptJlStatus.LASTPDDJ.getCode(), "00");
                 res.put(SysDeptJlStatus.LASTSQDJ.getCode(), "00");
@@ -756,7 +758,7 @@ public class DjpdSqServiceImpl implements IDjpdSqService
     public Map<String, Object> searchJgByUser(){
         Map<String, Object> res = djpdSqMapper.selectJgByJgId(SecurityUtils.getJgId());
         if (ObjectUtils.isNotEmpty(res)) {
-            EncryptionUtils.encryptionMap(res, YljgJcxx.class);
+            EncryptionUtils.encryptionMap(res, new YljgJcxx());
             LambdaQueryWrapper<DjpdSq> lqw = new LambdaQueryWrapper<DjpdSq>()
                     .eq(DjpdSq::getJgId, res.get(SysDeptJlStatus.ID.getCode()));
             Optional<DjpdSq> lastSq = djpdSqMapper.selectList(lqw).stream().max(Comparator.comparing(DjpdSq::getCreateTimeStr));

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/service/impl/PdzjServiceImpl.java

@@ -85,14 +85,14 @@ public class PdzjServiceImpl implements IPdzjService
         List<Pdzj> res = pdzjMapper.selectPdzjList(pdzj);
         res.forEach(r -> {
             LoginUser loginUser = userService.getUserInfo(SecurityUtils.getAreaCode().substring(0, 6) + "_" +
-                    r.getDh(), SecurityConstants.INNER).getData();
+                    SecurityUtils.sm4decrypt_ECB(SecurityUtils.getEncryptKey(), r.getDh()), SecurityConstants.INNER).getData();
             if (ObjectUtils.isNotEmpty(loginUser)) {
                 r.setSysUserNum(DataStatus.CLASSA.getCode());
             } else {
                 r.setSysUserNum(DataStatus.NORMAL.getCode());
             }
         });
-        return pdzjMapper.selectPdzjList(pdzj);
+        return res;
     }
 
     /**
@@ -119,18 +119,18 @@ public class PdzjServiceImpl implements IPdzjService
         AjaxResult res = AjaxResult.error("操作失败");
         Pdzj pdzj = pdzjMapper.selectById(id);
         if (ObjectUtils.isNotEmpty(pdzj)) {
-            LoginUser loginUser = userService.getUserInfo(SecurityUtils.getAreaCode().substring(0, 6) + "_" + pdzj.getDh(), SecurityConstants.INNER).getData();
+            LoginUser loginUser = userService.getUserInfo(SecurityUtils.getAreaCode().substring(0, 6) + "_" + SecurityUtils.sm4decrypt_ECB(SecurityUtils.getEncryptKey(), pdzj.getDh()), SecurityConstants.INNER).getData();
             if (ObjectUtils.isNotEmpty(loginUser)) {
                 throw new ServiceException("该专家账号已存在");
             }
             SysUser user = new SysUser();
             user.setDeptId(Long.valueOf(SecurityUtils.getUserUnitId()));
-            user.setUserName(SecurityUtils.getAreaCode().substring(0, 6) + "_" + pdzj.getDh());
+            user.setUserName(SecurityUtils.getAreaCode().substring(0, 6) + "_" + SecurityUtils.sm4decrypt_ECB(SecurityUtils.getEncryptKey(), pdzj.getDh()));
             user.setUserType(SysUserTypeStatus.PDZJ.getCode());
             user.setSex(SexStatus.UNKNOWN.getCode());
             user.setPassword(configService.getConfigKey("sys.user.initPassword", SecurityConstants.INNER)
                     .get("msg").toString());
-            user.setNickName(pdzj.getXm());
+            user.setNickName(SecurityUtils.sm4decrypt_ECB(SecurityUtils.getEncryptKey(), pdzj.getXm()));
             List<Long> roleIds = new ArrayList<>();
             roleIds.add(42L);
             user.setRoleIds(roleIds.toArray(new Long[0]));

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/service/impl/ZwywBgdjpdSqServiceImpl.java

@@ -57,7 +57,7 @@ public class ZwywBgdjpdSqServiceImpl implements IZwywBgdjpdSqService
     public Map<String, Object> selectZwywBgdjpdSqById(String id)
     {
         Map<String, Object> res = zwywBgdjpdSqMapper.selectZwywBgdjpdSqById(id);
-        EncryptionUtils.encryptionMap(res, ZwywBgdjpdSq.class);
+        EncryptionUtils.encryptionMap(res, new ZwywBgdjpdSq());
         return res;
     }
 

ruoyi-modules/mz-business-djpd/src/main/resources/mapper/business/ZwywBgdjpdSqMapper.xml

@@ -87,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectZwywBgdjpdSqById" parameterType="String" resultType="java.util.Map">
         SELECT
             a.id AS id,
+            a.sq_id AS sqId,
             a.sqdj AS sqdj,
             a.pddj AS lastPddj,
             a.pddj AS pddj,

ruoyi-modules/mz-business-lhcj/src/main/java/com/ruoyi/business/domain/ZwywCyrySxxx.java

@@ -129,7 +129,7 @@ public class ZwywCyrySxxx extends BaseEntity
     @ApiModelProperty(value = "通信地址", required = true)
     @NotBlank(message = "{通信地址}",groups = AddGroup.class)
     @Size(min = 1, max = 100, message = "{通信地址}")
-
+    @EncryptionV
     private String txdz;
 
     /** 失信信息描述 */

ruoyi-modules/mz-business-lhcj/src/main/java/com/ruoyi/business/domain/ZwywYljgSxxx.java

@@ -130,7 +130,7 @@ public class ZwywYljgSxxx extends BaseEntity
     @ApiModelProperty(value = "通信地址", required = true)
     @NotBlank(message = "{通信地址}",groups = AddGroup.class)
     @Size(min = 1, max = 100, message = "{通信地址}")
-
+    @EncryptionV
     private String txdzms;
 
     /** 失信信息描述 */

ruoyi-modules/mz-business-lhcj/src/main/java/com/ruoyi/business/service/impl/ZwywCyrySxxxServiceImpl.java

@@ -90,6 +90,7 @@ public class ZwywCyrySxxxServiceImpl implements IZwywCyrySxxxService
     @Override
     public List<ZwywCyrySxxx> selectZwywCyrySxxxByNrrdList(ZwywCyrySxxx zwywCyrySxxx)
     {
+        EncryptionUtils.encryption(zwywCyrySxxx);
         LambdaQueryWrapper<ZwywCyrySxxx> lqw = new LambdaQueryWrapper<ZwywCyrySxxx>()
                 .and(l -> l.in(ZwywCyrySxxx::getLzzt, zwywCyrySxxx.getLzztList()).or().in(ZwywCyrySxxx::getInstanceId
                         , zwywCyrySxxx.getInstanceIds()))
@@ -255,7 +256,7 @@ public class ZwywCyrySxxxServiceImpl implements IZwywCyrySxxxService
         StringBuilder failureMsg = new StringBuilder();
         List<Map<String,Object>> lists = zwywCyrySxxxMapper.selectCyrySxxxLists();
         lists.forEach(item->{
-            EncryptionUtils.encryptionMap(item, ZwywCyrySxxx.class);
+            EncryptionUtils.encryptionMap(item, new ZwywCyrySxxx());
         });
         int index = 0;
         for (ZwywCyrySxxx zwywCyrySxxx : sxxxList){

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/DjpdSqController.java

@@ -31,6 +31,7 @@ import com.ruoyi.system.domain.vo.TaskVo;
 import com.ruoyi.system.mapper.SysDeptJlMapper;
 import com.ruoyi.system.mapper.SysDjpdzbJbpzMapper;
 import com.ruoyi.system.utils.SubCodeUtil;
+import com.ruoyi.system.validate.group.AddGroup;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -158,7 +159,7 @@ public class DjpdSqController extends BaseController
         TaskVo task = djpdSqService.getInsIds("Activity_043fbis");
         djpdSq.setInstanceIds(task.getInsIds());
         Pdzj pdzjQuery = new Pdzj();
-        pdzjQuery.setDh(SecurityUtils.getUsername());
+        pdzjQuery.setDh(SecurityUtils.getUsername().substring(SecurityUtils.getUsername().indexOf("_") + 1));
         Pdzj zj = pdzjMapper.selectPdzjByDh(pdzjQuery);
         if (ObjectUtils.isNotEmpty(zj)) {
             PdzjCq cqQuery = new PdzjCq();
@@ -252,7 +253,7 @@ public class DjpdSqController extends BaseController
     @RequiresPermissions(value = {"business:djpdSq:add", "organization:djpdSqJg:add"}, logical = Logical.OR)
     @Log(title = "等级评定申请", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody DjpdSq djpdSq)
+    public AjaxResult add(@Validated({AddGroup.class}) @RequestBody DjpdSq djpdSq)
     {
         return AjaxResult.success(djpdSqService.insertDjpdSq(djpdSq));
     }

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/ZwywXzpdJgController.java

@@ -17,7 +17,6 @@ import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.enums.DataStatus;
 import com.ruoyi.system.api.enums.WhetherStatus;
 import com.ruoyi.system.domain.vo.TaskVo;
 import com.ruoyi.system.validate.group.AddGroup;
@@ -65,10 +64,9 @@ public class ZwywXzpdJgController extends BaseController
     {
         TaskVo task = djpdSqService.getInsIds("Activity_01z9id0");
         djpdSq.setInstanceIds(task.getInsIds());
-        LambdaQueryWrapper<Pdzj> lqw = new LambdaQueryWrapper<Pdzj>()
-                .eq(Pdzj::getDh, SecurityUtils.getUsername())
-                .eq(Pdzj::getStatus, DataStatus.NORMAL.getCode());
-        Pdzj zj = pdzjMapper.selectOne(lqw);
+        Pdzj pdzjQuery = new Pdzj();
+        pdzjQuery.setDh(SecurityUtils.getUsername().substring(SecurityUtils.getUsername().indexOf("_") + 1));
+        Pdzj zj = pdzjMapper.selectPdzjByDh(pdzjQuery);
         if (ObjectUtils.isNotEmpty(zj)) {
             LambdaQueryWrapper<PdzjCq> cqLqw = new LambdaQueryWrapper<PdzjCq>()
                     .eq(PdzjCq::getPdzjId, zj.getId());

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/SearchYljgJcxxServiceImpl.java

@@ -112,7 +112,7 @@ public class SearchYljgJcxxServiceImpl implements ISearchYljgJcxxService
         Map<String,Object> returnMap = new HashMap<>();
         List<Map<String, Object>> xq = gztMapper.selectDwtXq(jgId);
         xq.forEach(item->{
-            EncryptionUtils.encryptionMap(item, YljgJcxx.class);
+            EncryptionUtils.encryptionMap(item, new YljgJcxx());
         });
         if (CollectionUtils.isNotEmpty(xq)) {
             returnMap.put("mapData", xq);

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/YljgXfaqzcxxServiceImpl.java

@@ -12,7 +12,6 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.security.utils.EncryptionUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.organization.domain.YljgJcxx;
 import com.ruoyi.organization.mapper.YljgJcxxMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,14 +44,14 @@ public class YljgXfaqzcxxServiceImpl implements IYljgXfaqzcxxService
     @Override
     public Map<String,Object> selectYlJgMsg(String id){
         Map<String,Object> res = yljgJcxxMapper.selectYlJgMsgBuss(id);
-        EncryptionUtils.encryptionMap(res, YljgXfaqzcxx.class);
+        EncryptionUtils.encryptionMap(res, new YljgXfaqzcxx());
         return res;
     }
 
     @Override
     public Map<String,Object> selectYlJgMsgTT(){
         Map<String, Object> res = yljgJcxxMapper.selectYlJgMsgBuss(SecurityUtils.getJgId());
-        EncryptionUtils.encryptionMap(res, YljgXfaqzcxx.class);
+        EncryptionUtils.encryptionMap(res, new YljgXfaqzcxx());
         return res;
     }
 

ruoyi-ui/src/views/business/fwjggl/djpd/bgdjpdSh/index.vue

@@ -242,7 +242,7 @@
           <el-input v-model="form.jgId" placeholder="请输入机构ID" />
         </el-form-item>
 
-        <el-form-item
+        <!-- <el-form-item
           label="统一社会信用代码"
           prop="xydm"
           style="display: none"
@@ -289,9 +289,9 @@
             v-model="form.szxzqhId"
             placeholder="请输入所在行政区划主键标识"
           />
-        </el-form-item>
+        </el-form-item> -->
 
-        <el-form-item label="单位通信地址" prop="txdz" style="display: none">
+        <!-- <el-form-item label="单位通信地址" prop="txdz" style="display: none">
           <el-input v-model="form.txdz" placeholder="请输入单位通信地址" />
         </el-form-item>
 
@@ -531,7 +531,7 @@
 
         <el-form-item label="变更原因" prop="bgyy" style="display: none">
           <el-input v-model="form.bgyy" type="textarea" maxlength="200" show-word-limit placeholder="请输入变更原因" />
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item label="审核结果" prop="shjg">
           <el-select v-model="form.shjg" placeholder="请选择审核结果">
@@ -706,7 +706,7 @@ import {
   searchJg,
   updateBgdjpdSq
 } from "@/api/business/fwjggl/djpd/bgdjpdSq";
-import {chineseOne, Regular} from '@/utils/regular'
+import {chineseOne, Regular, Mobile, ID, Phone, Name} from '@/utils/regular'
 import {mapState} from "vuex";
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
@@ -781,7 +781,7 @@ export default {
         ],
         sjhm: [
           { required: true, message: "手机号码不能为空", trigger: "blur" },
-          { pattern: Regular.Mobile, message: "手机号格式不对", trigger: "blur"},
+          { validator: Mobile, trigger: "blur"},
         ],
         shjg: [
           { required: true, message: "审核结果不能为空", trigger: "blur" },
@@ -890,7 +890,7 @@ export default {
         this.queryParams.params["endSqsj"] = this.daterangeSqsj[1];
       }
       listBgdjpdSq(this.queryParams).then(response => {
-        this.bgdjpdSqList = response.rows;
+        this.bgdjpdSqList = decryptRowData_ECB(response.rows, [], []);
         this.total = response.total;
         this.loading = false;
       });
@@ -999,8 +999,8 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getBgdjpdSq(id).then(response => {
-        this.form = response.data;
-        this.detailsData = response.data;
+        this.form = decryptData_ECB(response.data, [], []);
+        this.detailsData = decryptData_ECB(response.data, ["txdz","frxm","frlxfs","frzjhm", "jglxrxm", "jgfzrxm", "jgfzrlxdh", "jglxdh", "sqrxm", "sqrlxdh", "sjhm"], [4, 1, 3, 2, 1, 1, 3, 3, 1, 3, 2]);
         this.form.szlx = this.form.szlx.split(",");
         this.form.shr = this.user.name;
         this.form.shsj = new Date();
@@ -1017,7 +1017,7 @@ export default {
     //   this.reset();
     //   const id = row.id || this.ids
     //   getBgdjpdSq(id).then(response => {
-    //     this.form = response.data;
+    //     this.form = decryptData_ECB(response.data, [], []);
     //     this.form.szlx = this.form.szlx.split(",");
     //     /****** sks 需要改动的地方 start ******/
     //     this.copyForm=this.deepCopy(response.data)
@@ -1029,7 +1029,7 @@ export default {
      /** 详情按钮操作 */
     handleDetails(row){
       getBgdjpdSq(row.id).then(response => {
-        this.detailsData = response.data;
+        this.detailsData = decryptData_ECB(response.data, ["txdz","frxm","frlxfs","frzjhm", "jglxrxm", "jgfzrxm", "jgfzrlxdh", "jglxdh", "sqrxm", "sqrlxdh", "sjhm"], [4, 1, 3, 2, 1, 1, 3, 3, 1, 3, 2]);
         this.detailsOpen=true;
       });
     },

ruoyi-ui/src/views/business/fwjggl/djpd/bgdjpdSq/index.vue

@@ -412,9 +412,9 @@
 <script>
 import {addBgdjpdSq, delBgdjpdSq, getBgdjpdSq, listBgdjpdSq, updateBgdjpdSq} from "@/api/business/fwjggl/djpd/bgdjpdSq";
 import {getJgByUser} from '@/api/business/fwjggl/djpd/djpdSq'
-import {chineseOne, Regular} from '@/utils/regular'
+import {chineseOne, Regular, Mobile, ID, Phone, Name} from '@/utils/regular'
 import {mapState} from "vuex";
-import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
+import { decryptData_ECB, decryptRowData_ECB, decrypt_ECB } from "@/api/tool/sm4";
 
 export default {
   name: "BgdjpdSq",
@@ -493,7 +493,7 @@ export default {
         ],
         sjhm: [
           { required: true, message: "手机号码不能为空", trigger: "blur" },
-          { pattern: Regular.Mobile, message: "号码格式：131xxxxxxxx或010-88xxxxx", trigger: "blur" },
+          { validator: Mobile, trigger: "blur" },
         ],
         frzjhm:[
           { required: true, message: "证件号码不能为空", trigger: "blur" }
@@ -515,7 +515,14 @@ export default {
       this.valid(this.rules, 'frzjhm', this.form.frzjlx)
     },
     getJgxx(res) {
-      console.log(res);
+      this.form.Mtxdz = decrypt_ECB(res.data.txdz)
+      this.form.Mjglxrxm = decrypt_ECB(res.data.frxm)
+      this.form.Mjgfzrxm = decrypt_ECB(res.data.frxm)
+      this.form.Mjgfzrlxdh = decrypt_ECB(res.data.frlxfs)
+      this.form.Mfrxm = decrypt_ECB(res.data.frxm)
+      this.form.Mfrzjhm = decrypt_ECB(res.data.frzjhm)
+      this.form.Mfrlxfs = decrypt_ECB(res.data.frlxfs)
+      res.data = decryptData_ECB(res.data, ["txdz","frxm","frlxfs","frzjhm"], [4, 1, 3, 2])
       this.searchXydm = res.data.tyshxydm;
       this.form.jgId = res.data.id;
       this.form.sqId = res.data.sqId;
@@ -527,7 +534,7 @@ export default {
       this.form.dwssxzqhId = res.data.ssxzqhCode;
       this.form.txdz = res.data.txdz;
       this.form.jglxrxm = res.data.frxm;
-      this.form.jgfzrxm = res.data.jgfzr;
+      this.form.jgfzrxm = res.data.frxm;
       this.form.jgfzrlxdh = res.data.frlxfs;
       this.form.frxm = res.data.frxm;
       this.form.frzjlx = res.data.frzjlx;
@@ -561,7 +568,7 @@ export default {
         this.queryParams.params["endSqsj"] = this.daterangeSqsj[1];
       }
       listBgdjpdSq(this.queryParams).then(response => {
-        this.bgdjpdSqList = response.rows;
+        this.bgdjpdSqList = decryptRowData_ECB(response.rows, [], []);
         this.total = response.total;
         this.loading = false;
       });
@@ -664,6 +671,14 @@ export default {
       if (this.user.userData.userType != '00') {
         getJgByUser().then(res => {
           if (res.data) {
+            this.form.Mtxdz = decrypt_ECB(res.data.txdz)
+            this.form.Mjglxrxm = decrypt_ECB(res.data.frxm)
+            this.form.Mjgfzrxm = decrypt_ECB(res.data.frxm)
+            this.form.Mjgfzrlxdh = decrypt_ECB(res.data.frlxfs)
+            this.form.Mfrxm = decrypt_ECB(res.data.frxm)
+            this.form.Mfrzjhm = decrypt_ECB(res.data.frzjhm)
+            this.form.Mfrlxfs = decrypt_ECB(res.data.frlxfs)
+            res.data = decryptData_ECB(res.data, ["txdz","frxm","frlxfs","frzjhm"], [4, 1, 3, 2])
             this.searchXydm = res.data.tyshxydm;
             this.form.jgId = res.data.id;
             this.form.sqId = res.data.sqId;
@@ -675,7 +690,7 @@ export default {
             this.form.dwssxzqhId = res.data.ssxzqhCode;
             this.form.txdz = res.data.txdz;
             this.form.jglxrxm = res.data.frxm;
-            this.form.jgfzrxm = res.data.jgfzr;
+            this.form.jgfzrxm = res.data.frxm;
             this.form.jgfzrlxdh = res.data.frlxfs;
             this.form.frxm = res.data.frxm;
             this.form.frzjlx = res.data.frzjlx;
@@ -724,7 +739,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getBgdjpdSq(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, [], []);
         this.form.szlx = this.form.szlx.split(",");
         /****** sks 需要改动的地方 start ******/
         this.copyForm = this.deepCopy(response.data)
@@ -736,7 +751,7 @@ export default {
      /** 详情按钮操作 */
     handleDetails(row){
       getBgdjpdSq(row.id).then(response => {
-        this.detailsData = response.data;
+        this.detailsData = decryptData_ECB(response.data, ["txdz","frxm","frlxfs","frzjhm", "jglxrxm", "jgfzrxm", "jgfzrlxdh", "jglxdh", "sqrxm", "sqrlxdh", "sjhm"], [4, 1, 3, 2, 1, 1, 3, 3, 1, 3, 2]);
         this.detailsOpen=true;
       });
     },
@@ -744,6 +759,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          console.log('aaa')
           this.submitFormLoading = true;
           if (this.form.id != null) {
             /****** sks 需要改动的地方 start ******/

ruoyi-ui/src/views/business/fwjggl/djpd/djpdGx/index.vue

@@ -315,7 +315,7 @@ export default {
         this.queryParams.params["endSqsj"] = this.daterangeSqsj[1];
       }
       listDjpdGx(this.queryParams).then((response) => {
-        this.djpdGxList = response.rows;
+        this.djpdGxList = decryptRowData_ECB(response.rows, [], []);
         this.total = response.total;
         this.loading = false;
       });
@@ -433,7 +433,8 @@ export default {
       this.resetSq();
       const id = row.id || this.ids;
       getDjpdSqConfig(id,'djpdGs').then((response) => {
-        this.sqform = response.data;
+        this.sqform = decryptData_ECB(response.data, ["txdz","frxm","frlxfs","frzjhm", "jglxrxm", "jgfzrxm", "jgfzrlxdh", "jglxdh", "sqrxm", "sqrlxdh"], [4, 1, 3, 2, 1, 1, 3, 3, 1, 3]);
+        this.sqform.xqList[0].djpdSq = decryptData_ECB(this.sqform.xqList[0].djpdSq, ["sqrxm","sqrlxdh"], [1, 3])
         this.opensq = true;
         this.sqform.xqList.unshift(
           {

ruoyi-ui/src/views/business/fwjggl/djpd/djpdSh/index.vue

@@ -405,7 +405,7 @@ export default {
           this.queryParams.params['endSqsj'] = this.daterangeSqsj[1]
         }
         listDjpdSh(this.queryParams).then((response) => {
-          this.djpdShList = response.rows
+          this.djpdShList = decryptRowData_ECB(response.rows, ["sqrxm"], [1])
           this.total = response.total
           this.loading = false
         })
@@ -497,7 +497,7 @@ export default {
         this.reset()
         const id = row.id || this.ids
         getDjpdSq(id).then((response) => {
-          this.form = response.data
+          this.form = decryptData_ECB(response.data, ["txdz","frxm","frlxfs","frzjhm", "jglxrxm", "jgfzrxm", "jgfzrlxdh", "jglxdh", "sqrxm", "sqrlxdh"], [4, 1, 3, 2, 1, 1, 3, 3, 1, 3]);
           this.form.szlx = this.form.szlx ? this.form.szlx.split(',') : []
           this.form.taskId = row.taskId
           this.open = true
@@ -507,7 +507,7 @@ export default {
       handleXQ(row) {
         this.details = {}
         getDjpdSqConfig(row.id, 'pdjgSh').then((response) => {
-          this.details = response.data
+          this.details = decryptData_ECB(response.data, ["txdz","frxm","frlxfs","frzjhm", "jglxrxm", "jgfzrxm", "jgfzrlxdh", "jglxdh", "sqrxm", "sqrlxdh"], [4, 1, 3, 2, 1, 1, 3, 3, 1, 3]);
           this.details.xqList.unshift(
             {
               'jg': {
@@ -527,9 +527,16 @@ export default {
             const param = {
               szlx: this.form.szlx.join(',')
             }
+            const nForm = {
+              id: this.form.id,
+              taskId: this.form.taskId,
+              instanceId: this.form.instanceId,
+              sljg: this.form.sljg,
+              sljy: this.form.sljy
+            }
             this.submitFormLoading = true
             if (this.form.id != null) {
-              updateDjpdSh({ ...this.form, ...param })
+              updateDjpdSh(nForm)
                 .then((response) => {
                   this.$modal.msgSuccess('受理成功')
                   this.open = false

ruoyi-ui/src/views/business/fwjggl/djpd/djpdSl/index.vue

@@ -312,7 +312,8 @@ export default {
     handleXQ(row){
       this.details={};
       getDjpdSqConfig(row.id,'djpdSl').then((response) => {
-        this.details = response.data;
+        this.details = decryptData_ECB(response.data, ["txdz","frxm","frlxfs","frzjhm", "jglxrxm", "jgfzrxm", "jgfzrlxdh", "jglxdh", "sqrxm", "sqrlxdh"], [4, 1, 3, 2, 1, 1, 3, 3, 1, 3]);
+        this.details.xqList[0].djpdSq = decryptData_ECB(this.details.xqList[0].djpdSq, ["sqrxm","sqrlxdh"], [1, 3])
         this.details.xqList.unshift(
           {
             'jg':{
@@ -395,7 +396,7 @@ export default {
         this.queryParams.params["endSqsj"] = this.daterangeSqsj[1];
       }
       listDjpdSl(this.queryParams).then((response) => {
-        this.djpdSqList = response.rows;
+        this.djpdSqList = decryptRowData_ECB(response.rows, [], []);
         this.total = response.total;
         this.loading = false;
       });
@@ -493,7 +494,7 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getDjpdSq(id).then((response) => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["txdz","frxm","frlxfs","frzjhm", "jglxrxm", "jgfzrxm", "jgfzrlxdh", "jglxdh", "sqrxm", "sqrlxdh"], [4, 1, 3, 2, 1, 1, 3, 3, 1, 3]);
         this.form.szlx = this.form.szlx ? this.form.szlx.split(",") : [];
         this.form.taskId = row.taskId;
         this.open = true;
@@ -504,12 +505,16 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          const param = {
-            szlx: this.form.szlx.join(","),
+          const nForm = {
+            id: this.form.id,
+            taskId: this.form.taskId,
+            instanceId: this.form.instanceId,
+            sljg: this.form.sljg,
+            sljy: this.form.sljy,
           };
           this.submitFormLoading = true;
           if (this.form.id != null) {
-            updateDjpdSl({ ...this.form, ...param })
+            updateDjpdSl(nForm)
               .then((response) => {
                 this.$modal.msgSuccess("受理成功");
                 this.open = false;

ruoyi-ui/src/views/business/fwjggl/djpd/djpdSq/index.vue

@@ -176,9 +176,9 @@ import {
   updateDjpdSq,
   updateDjpdStart
 } from '@/api/business/fwjggl/djpd/djpdSq'
-import { chineseOne, Regular } from '@/utils/regular'
+import { chineseOne, Regular , Mobile, ID, Phone, Name} from '@/utils/regular'
 import { mapState } from 'vuex'
-import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
+import { decryptData_ECB, decryptRowData_ECB, decrypt_ECB } from "@/api/tool/sm4";
 
 export default {
   name: 'DjpdSq',
@@ -243,7 +243,7 @@ export default {
         ],
         sqrlxdh: [
           { required: true, message: '申请人联系电话不能为空', trigger: 'blur' },
-          { pattern: Regular.Mobile, message: '号码格式：131xxxxxxxx或010-88xxxxx', trigger: 'blur' }
+          { validator: Mobile, trigger: 'blur' }
         ],
         sqsj: [
           { required: true, message: '申请日期不能为空', trigger: 'blur' }
@@ -276,6 +276,15 @@ export default {
       return this.selectDictLabel(this.dict.type[type], value)
     },
     getJgxx(res) {
+      this.form.Mtxdz = decrypt_ECB(res.data.txdz)
+      this.form.Mjglxrxm = decrypt_ECB(res.data.frxm)
+      this.form.Mjgfzrxm = decrypt_ECB(res.data.frxm)
+      this.form.Mjgfzrlxdh = decrypt_ECB(res.data.frlxfs)
+      this.form.Mfrxm = decrypt_ECB(res.data.frxm)
+      this.form.Mfrzjhm = decrypt_ECB(res.data.frzjhm)
+      this.form.Mfrlxfs = decrypt_ECB(res.data.frlxfs)
+      this.form.Mjglxdh = decrypt_ECB(res.data.frlxfs)
+      res.data = decryptData_ECB(res.data, ["txdz","frxm","frlxfs","frzjhm"], [4, 1, 3, 2])
       this.searchXydm = res.data.tyshxydm
       this.form.jgId = res.data.id
       this.form.xydm = res.data.tyshxydm
@@ -286,7 +295,7 @@ export default {
       this.form.dwssxzqhId = res.data.ssxzqhCode
       this.form.txdz = res.data.txdz
       this.form.jglxrxm = res.data.frxm
-      this.form.jgfzrxm = res.data.jgfzr
+      this.form.jgfzrxm = res.data.frxm
       this.form.jgfzrlxdh = res.data.frlxfs
       this.form.frxm = res.data.frxm
       this.form.frzjlx = res.data.frzjlx
@@ -321,13 +330,13 @@ export default {
       }
       if (this.user.userData.userType != '00') {
         listDjpdSqByUser(this.queryParams).then((response) => {
-          this.djpdSqList = response.rows
+          this.djpdSqList = decryptRowData_ECB(response.rows, [], [])
           this.total = response.total
           this.loading = false
         })
       } else {
         listDjpdSq(this.queryParams).then((response) => {
-          this.djpdSqList = response.rows
+          this.djpdSqList = decryptRowData_ECB(response.rows, [], [])
           this.total = response.total
           this.loading = false
         })
@@ -381,7 +390,7 @@ export default {
         isSmfw: null,
         ylfwxs: null,
         chxpfrq: null,
-        isFhyq: null,
+        isFhyq: '1',
         sqdj: null,
         sqrxm: null,
         sqrlxdh: null,
@@ -421,6 +430,15 @@ export default {
       if (this.user.userData.userType != '00') {
         getJgByUser().then(res => {
           if (res.data) {
+            this.form.Mtxdz = decrypt_ECB(res.data.txdz)
+            this.form.Mjglxrxm = decrypt_ECB(res.data.frxm)
+            this.form.Mjgfzrxm = decrypt_ECB(res.data.frxm)
+            this.form.Mjgfzrlxdh = decrypt_ECB(res.data.frlxfs)
+            this.form.Mfrxm = decrypt_ECB(res.data.frxm)
+            this.form.Mfrzjhm = decrypt_ECB(res.data.frzjhm)
+            this.form.Mfrlxfs = decrypt_ECB(res.data.frlxfs)
+            this.form.Mjglxdh = decrypt_ECB(res.data.frlxfs)
+            res.data = decryptData_ECB(res.data, ["txdz","frxm","frlxfs","frzjhm"], [4, 1, 3, 2])
             this.searchXydm = res.data.tyshxydm
             this.form.jgId = res.data.id
             this.form.xydm = res.data.tyshxydm
@@ -431,7 +449,7 @@ export default {
             this.form.dwssxzqhId = res.data.ssxzqhCode
             this.form.txdz = res.data.txdz
             this.form.jglxrxm = res.data.frxm
-            this.form.jgfzrxm = res.data.jgfzr
+            this.form.jgfzrxm = res.data.frxm
             this.form.jgfzrlxdh = res.data.frlxfs
             this.form.frxm = res.data.frxm
             this.form.frzjlx = res.data.frzjlx
@@ -469,15 +487,20 @@ export default {
       const id = row.id || this.ids
       if (this.user.userData.userType != '00') {
         getUserDjpdSq(id).then((response) => {
-          this.form = response.data
+          response.data.Msqrxm = decrypt_ECB(response.data.sqrxm),
+          response.data.Msqrlxdh = decrypt_ECB(response.data.sqrlxdh)
+          this.form = decryptData_ECB(response.data, ["txdz","frxm","frlxfs","frzjhm", "jglxrxm", "jgfzrxm", "jgfzrlxdh", "jglxdh", "sqrxm", "sqrlxdh"], [4, 1, 3, 2, 1, 1, 3, 3, 1, 3])
           this.form.szlx = this.form.szlx ? this.form.szlx.split(',') : []
           this.open = true
           this.title = '修改等级评定申请'
         })
       } else {
         getDjpdSq(id).then((response) => {
-          this.form = response.data
+          response.data.Msqrxm = decrypt_ECB(response.data.sqrxm),
+          response.data.Msqrlxdh = decrypt_ECB(response.data.sqrlxdh)
+          this.form = decryptData_ECB(response.data, ["txdz","frxm","frlxfs","frzjhm", "jglxrxm", "jgfzrxm", "jgfzrlxdh", "jglxdh", "sqrxm", "sqrlxdh"], [4, 1, 3, 2, 1, 1, 3, 3, 1, 3])
           this.form.szlx = this.form.szlx ? this.form.szlx.split(',') : []
+          console.log(this.form)
           this.open = true
           this.title = '修改等级评定申请'
         })
@@ -486,7 +509,8 @@ export default {
     handleXQ(row) {
       this.details = {};
       getDjpdSqConfig(row.id, 'djpdSq').then((response) => {
-        this.details = response.data;
+        this.details = decryptData_ECB(response.data, ["txdz","frxm","frlxfs","frzjhm", "jglxrxm", "jgfzrxm", "jgfzrlxdh", "jglxdh", "sqrxm", "sqrlxdh"], [4, 1, 3, 2, 1, 1, 3, 3, 1, 3]);
+        this.details.xqList[0].djpdSq = decryptData_ECB(this.details.xqList[0].djpdSq, ["sqrxm","sqrlxdh"], [1, 3])
         this.details.xqList.unshift(
           {
             'jg': {
@@ -520,7 +544,23 @@ export default {
           }
           this.submitFormLoading = true
           if (this.form.id != null) {
-            updateDjpdSq({ ...this.form, ...param })
+            if (!this.form.sqrxm.includes('✱')) {
+              this.form.Msqrxm = this.form.sqrxm;
+            }
+            if (!this.form.sqrlxdh.includes('✱')) {
+              this.form.Msqrlxdh = this.form.sqrlxdh;
+            }
+            const nForm = {
+              id: this.form.id,
+              isFhyq: this.form.isFhyq,
+              sqdj: this.form.sqdj,
+              sqrxm: this.form.Msqrxm,
+              sqrlxdh: this.form.Msqrlxdh,
+              sqsj: this.form.sqsj,
+              xgcl: this.form.xgcl,
+            }
+            console.log(nForm)
+            updateDjpdSq(nForm)
               .then((response) => {
                 this.$modal.msgSuccess('修改成功')
                 this.open = false
@@ -528,6 +568,14 @@ export default {
               })
               .finally(() => (this.submitFormLoading = false))
           } else {
+            this.form.txdz = this.form.Mtxdz
+            this.form.jglxrxm = this.form.Mjglxrxm
+            this.form.jgfzrxm = this.form.Mjgfzrxm
+            this.form.jgfzrlxdh = this.form.Mjgfzrlxdh
+            this.form.frxm = this.form.Mfrxm
+            this.form.frzjhm = this.form.Mfrzjhm
+            this.form.frlxfs = this.form.Mfrlxfs
+            this.form.jglxdh = this.form.Mjglxdh
             addDjpdSq({ ...this.form, ...param })
               .then((response) => {
                 this.$modal.msgSuccess('新增成功')
@@ -551,7 +599,22 @@ export default {
           }
           this.submitFormLoading = true
           if (this.form.id != null) {
-            updateDjpdSq({ ...this.form, ...param })
+            if (!this.form.sqrxm.includes('✱')) {
+              this.form.Msqrxm = this.form.sqrxm;
+            }
+            if (!this.form.sqrlxdh.includes('✱')) {
+              this.form.Msqrlxdh = this.form.sqrlxdh;
+            }
+            const nForm = {
+              id: this.form.id,
+              isFhyq: this.form.isFhyq,
+              sqdj: this.form.sqdj,
+              sqrxm: this.form.Msqrxm,
+              sqrlxdh: this.form.Msqrlxdh,
+              sqsj: this.form.sqsj,
+              xgcl: this.form.xgcl,
+            }
+            updateDjpdSq(nForm)
               .then((response) => {
                 updateDjpdStart(response.data.id).then((res) => {
                   this.$modal.msgSuccess('该申请已提交')
@@ -563,6 +626,14 @@ export default {
               })
               .finally(() => (this.submitFormLoading = false))
           } else {
+            this.form.txdz = this.form.Mtxdz
+            this.form.jglxrxm = this.form.Mjglxrxm
+            this.form.jgfzrxm = this.form.Mjgfzrxm
+            this.form.jgfzrlxdh = this.form.Mjgfzrlxdh
+            this.form.frxm = this.form.Mfrxm
+            this.form.frzjhm = this.form.Mfrzjhm
+            this.form.frlxfs = this.form.Mfrlxfs
+            this.form.jglxdh = this.form.Mjglxdh
             addDjpdSq({ ...this.form, ...param })
               .then((response) => {
                 updateDjpdStart(response.data.id).then((res) => {

ruoyi-ui/src/views/business/fwjggl/djpd/djzsCx/index.vue

@@ -208,7 +208,7 @@ export default {
         this.queryParams.params["gqrq"] = this.queryParams.gqrq;
       }
       listDjzspbCx(this.queryParams).then((response) => {
-        this.djzspbList = response.rows;
+        this.djzspbList = decryptRowData_ECB(response.rows, [], []);
         this.total = response.total;
         this.loading = false;
       });
@@ -269,8 +269,8 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getDjzspb(id).then((response) => {
-        this.form = response.data;
-        this.detailsData = response.data;
+        this.form = decryptData_ECB(response.data, [], []);
+        this.detailsData = decryptData_ECB(response.data, ["zslqrxm","zslqrlxdh","zsthxm","zsthlxdh","pblqrxm","pblqrlxdh","pbthxm","pbthlxdh"], [1,3,1,3,1,3,1,3])
         /****** sks 需要改动的地方 start ******/
         this.copyForm = this.deepCopy(response.data);
         /****** sks 需要改动的地方 end ******/

ruoyi-ui/src/views/business/fwjggl/djpd/djzspb/index.vue

@@ -308,7 +308,7 @@
 
 <script>
 import {addDjzspb, delDjzspb, getDjzspb, listDjzspb, updateDjzspb} from '@/api/business/fwjggl/djpd/djzspb'
-import {chineseOne} from '@/utils/regular'
+import {chineseOne, Mobile, ID, Phone, Name} from '@/utils/regular'
 import {mapState} from "vuex";
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
@@ -550,7 +550,7 @@ export default {
           this.queryParams.params['endSqsj'] = this.daterangeSqsj[1]
         }
         listDjzspb(this.queryParams).then((response) => {
-          this.djzspbList = response.rows
+          this.djzspbList = decryptRowData_ECB(response.rows, [], [])
           this.total = response.total
           this.loading = false
         })
@@ -631,9 +631,9 @@ export default {
         this.index = index
         const id = row.id || this.ids
         getDjzspb(id).then((response) => {
-          this.form = response.data
+          this.form = decryptData_ECB(response.data, [], [])
           this.copyForm = this.deepCopy(response.data)
-          this.detailsData = response.data
+          this.detailsData = decryptData_ECB(response.data, ["zslqrxm","zslqrlxdh","zsthxm","zsthlxdh","pblqrxm","pblqrlxdh","pbthxm","pbthlxdh"], [1,3,1,3,1,3,1,3])
           this.open = true
           this.form.jgId = row.jgId
           this.form.sqId = row.sqId
@@ -645,7 +645,7 @@ export default {
       /** 详情按钮操作 */
       handleDetails(row) {
         getDjzspb(row.id).then(response => {
-          this.detailsData = response.data
+          this.detailsData = decryptData_ECB(response.data, ["zslqrxm","zslqrlxdh","zsthxm","zsthlxdh","pblqrxm","pblqrlxdh","pbthxm","pbthlxdh"], [1,3,1,3,1,3,1,3])
           this.detailsOpen = true
         })
       },
@@ -690,6 +690,7 @@ export default {
               // dictValue: "16"
               // form.pbthzt
               // form.zsthzt
+              
               let formData = this.comparisonObject(this.form, this.copyForm)
               if (formData) {
                 let sqzt='';
@@ -703,7 +704,7 @@ export default {
                 }else if(this.form.pbthzt=='1'&&this.form.zsthzt=='0'){
                   sqzt='15'
                 }
-                updateDjzspb({ ...formData, id: this.form.id, jgId: this.form.jgId, sqId: this.form.sqId, sqzt: sqzt })
+                updateDjzspb({ ...formData, id: this.form.id, jgId: this.form.jgId, sqId: this.form.sqId, sqzt: sqzt, pblqrlxdh: null, pblqrxm: null, zslqrlxdh: null, zslqrxm: null })
                   .then((response) => {
                     this.open = false
                     this.$modal.msgSuccess('修改成功')

ruoyi-ui/src/views/business/fwjggl/djpd/gsjgFk/index.vue

@@ -430,7 +430,7 @@ export default {
     getList() {
       this.loading = true;
       listDJpdGsjgFk(this.queryParams).then((response) => {
-        this.gsjgFkList = response.rows;
+        this.gsjgFkList = decryptRowData_ECB(response.rows, [], []);
         this.total = response.total;
         this.loading = false;
       });
@@ -439,7 +439,7 @@ export default {
     getRecordList() {
       this.loading = true;
       listGsjgFk(this.recordQueryParams).then((response) => {
-        this.recordFkList = response.rows;
+        this.recordFkList = decryptRowData_ECB(response.rows, ["fkrxm","fkrlxdh"], [1,2]);
         this.recordTotal = response.total;
         this.loading = false;
       });
@@ -503,7 +503,7 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getGsjgFk(id).then((response) => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["fkrxm","fkrlxdh"], [1,2]);
         /****** sks 需要改动的地方 start ******/
         this.copyForm = this.deepCopy(response.data);
         /****** sks 需要改动的地方 end ******/

ruoyi-ui/src/views/business/fwjggl/djpd/jbtjPd/index.vue

@@ -472,7 +472,6 @@ export default {
             message: "机构负责人联系电话不能为空",
             trigger: "blur",
           },
-          // { pattern: Regular.Phone, message: "电话号格式不对", trigger: "blur"},
         ],
         frxm: [
           { required: true, message: "法人姓名不能为空", trigger: "blur" },
@@ -492,11 +491,6 @@ export default {
         ],
         frlxfs: [
           { required: true, message: "法人联系方式不能为空", trigger: "blur" },
-          {
-            pattern: Regular.Mobile,
-            message: "手机号格式不对",
-            trigger: "blur",
-          },
         ],
         frdjjg: [
           { required: true, message: "法人登记机关不能为空", trigger: "blur" },
@@ -542,7 +536,6 @@ export default {
         ],
         jglxdh: [
           { required: true, message: "机构联系电话不能为空", trigger: "blur" },
-          // { pattern: Regular.Phone, message: "电话号格式不对", trigger: "blur"},
         ],
         isQyylzx: [
           {
@@ -600,7 +593,6 @@ export default {
             message: "申请人联系电话不能为空",
             trigger: "blur",
           },
-          // { pattern: Regular.Phone, message: "电话号格式不对", trigger: "blur"},
         ],
         sqsj: [
           { required: true, message: "申请日期不能为空", trigger: "blur" },
@@ -687,7 +679,7 @@ export default {
     getList() {
       this.loading = true;
       listJbtjPd(this.queryParams).then((response) => {
-        this.djpdShList = response.rows;
+        this.djpdShList = decryptRowData_ECB(response.rows, [], []);
         this.total = response.total;
         this.loading = false;
       });
@@ -695,7 +687,7 @@ export default {
     getAddList() {
       this.loading = true;
       listJbtjPdSub(this.addQueryParams).then((response) => {
-        this.addList = response.rows;
+        this.addList = decryptRowData_ECB(response.rows, [], []);
         this.addTotal = response.total;
         this.loading = false;
       });
@@ -834,7 +826,7 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getDjpdSq(id).then((response) => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["txdz","frxm","frlxfs","frzjhm", "jglxrxm", "jgfzrxm", "jgfzrlxdh", "jglxdh", "sqrxm", "sqrlxdh"], [4, 1, 3, 2, 1, 1, 3, 3, 1, 3]);
         this.form.szlx = this.form.szlx ? this.form.szlx.split(",") : [];
         this.open = true;
         this.title = "详情";

ruoyi-ui/src/views/business/fwjggl/djpd/pdjgGx/index.vue

@@ -310,7 +310,7 @@ export default {
         this.queryParams.params["endSqsj"] = this.daterangeSqsj[1];
       }
       listPdjgGx(this.queryParams).then((response) => {
-        this.djpdGxList = response.rows;
+        this.djpdGxList = decryptRowData_ECB(response.rows, [], []);
         this.total = response.total;
         this.loading = false;
       });
@@ -428,7 +428,8 @@ export default {
       this.resetSq();
       const id = row.id || this.ids;
       getDjpdSqConfig(id,'djpdGs').then((response) => {
-        this.sqform = response.data;
+        this.sqform = decryptData_ECB(response.data, ["txdz","frxm","frlxfs","frzjhm", "jglxrxm", "jgfzrxm", "jgfzrlxdh", "jglxdh", "sqrxm", "sqrlxdh"], [4, 1, 3, 2, 1, 1, 3, 3, 1, 3]);
+        this.sqform.xqList[0].djpdSq = decryptData_ECB(this.sqform.xqList[0].djpdSq, ["sqrxm","sqrlxdh"], [1, 3])
         this.opensq = true;
         this.sqform.xqList.unshift(
           {

ruoyi-ui/src/views/business/fwjggl/djpd/pdzj/index.vue

@@ -373,9 +373,9 @@ import {
   updatePdzj,
   updatePdzjStatus
 } from '@/api/business/fwjggl/djpd/pdzj'
-import {chineseOne, idCard, Regular} from '@/utils/regular'
+import {chineseOne, idCard, Regular, Mobile, ID, Phone, Name} from '@/utils/regular'
 import pdzjcyjl from './table'
-import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
+import { decryptData_ECB, decryptRowData_ECB, decrypt_ECB } from "@/api/tool/sm4";
 
 export default {
     name: 'Pdzj',
@@ -459,8 +459,7 @@ export default {
           ],
           dh: [
             { required: true, message: '联系电话不能为空', trigger: 'blur' },
-            { pattern: Regular.Mobile, message: '手机号格式不对', trigger: 'blur' },
-            // { pattern: Regular.Phone, message: "电话号格式不对", trigger: "blur"},
+            { validator: Mobile, trigger: 'blur' },
           ],
           hjqhId: [
             { required: true, message: '户籍区划不能为空', trigger: 'blur' }
@@ -499,7 +498,7 @@ export default {
       getList() {
         this.loading = true
         listPdzj(this.queryParams).then((response) => {
-          this.pdzjList = response.rows
+          this.pdzjList = decryptRowData_ECB(response.rows, ["xm","zjhm","dh"], [1, 2, 3])
           this.total = response.total
           this.loading = false
         })
@@ -569,7 +568,10 @@ export default {
         this.reset()
         const id = row.id || this.ids
         getPdzj(id).then((response) => {
-          this.form = response.data
+          response.data.rowXm = decrypt_ECB(response.data.xm)
+          response.data.rowLxdh = decrypt_ECB(response.data.dh)
+          response.data.rowZjhm = decrypt_ECB(response.data.zjhm)
+          this.form = decryptData_ECB(response.data, ["xm","zjhm","dh"], [1, 2, 3])
 
           let copyData={
             ...response.data,
@@ -599,7 +601,7 @@ export default {
         this.reset()
         const id = row.id || this.ids
         getPdzj(id).then((response) => {
-          this.form = response.data
+          this.form = decryptData_ECB(response.data, ["xm","zjhm","dh"], [1, 2, 3])
           this.form.hjqhId = JSON.stringify(this.form.hjqhId.split(','))
           // this.form.dwqhId = JSON.stringify(this.form.dwqhId.split(','))
           this.oldId = id

ruoyi-ui/src/views/business/fwjggl/djpd/pdzj/table.vue

@@ -235,7 +235,7 @@ export default {
       getCyjlList() {
         this.loading = true
         listPdzjCyjl({...this.queryParams,zjId:this.zjId}).then((response) => {
-          this.pdzjCyjlList = response.rows
+          this.pdzjCyjlList = decryptRowData_ECB(response.rows, ["xm","zjhm","dh"], [1, 2, 3])
           this.total = response.total
           this.loading = false;
           console.log(this.loading,'this.loading');
@@ -277,7 +277,7 @@ export default {
         this.resetCyjl()
         const id = row.id
         getPdzjCyjl(id).then((response) => {
-          this.form = response.data
+          this.form = decryptData_ECB(response.data, ["xm","zjhm","dh"], [1, 2, 3])
           this.form.dwqhId = JSON.stringify(this.form.dwqhId.split(','))
           let copyData={
             ...response.data,
@@ -303,11 +303,16 @@ export default {
               ...this.form,
               dwqhId: dwqhId
             }
+            const nForm = {
+              xm: this.cyjlform.rowXm,
+              zjhm: this.cyjlform.rowZjhm,
+              dh: this.cyjlform.rowLxdh
+            }
             this.submitFormLoading = true
             if (this.form.id != null) {
               let formData=this.comparisonObject(pamar,this.copyForm)
               if(formData) {
-                updatePdzjCyjl({...formData,id:this.form.id})
+                updatePdzjCyjl({...formData,id:this.form.id, ...nForm})
                   .then((response) => {
                     this.$modal.msgSuccess('修改成功')
                     this.open = false
@@ -325,7 +330,7 @@ export default {
                 this.submitFormLoading = false;
               }
             } else {
-              addPdzjCyjl(pamar)
+              addPdzjCyjl({...pamar, ...nForm})
                 .then((response) => {
                   this.$modal.msgSuccess('新增成功')
                   this.open = false

ruoyi-ui/src/views/business/fwjggl/djpd/pdzjCq/indexnew.vue

@@ -583,7 +583,7 @@ export default {
         this.queryParams.params["endSqsj"] = this.daterangeSqsj[1];
       }
       listDjpdCq(this.queryParams).then((response) => {
-        this.djpdSqList = response.rows;
+        this.djpdSqList = decryptRowData_ECB(response.rows, [], []);
         this.total = response.total;
         this.loading = false;
       });
@@ -593,7 +593,7 @@ export default {
       this.loading = true;
       this.zjqueryParams.status = '0';
       listPdzj(this.zjqueryParams).then((response) => {
-        this.dxzList = response.rows;
+        this.dxzList = decryptRowData_ECB(response.rows, ["xm","zjhm","dh"], [1, 2, 3]);
         this.zjtotal = response.total;
         this.loading = false;
       });
@@ -717,7 +717,9 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getDjpdSqConfig(id,'pdzjCq').then((response) => {
-        this.xqform = response.data;
+        this.xqform = decryptData_ECB(response.data, ["txdz","frxm","frlxfs","frzjhm", "jglxrxm", "jgfzrxm", "jgfzrlxdh", "jglxdh", "sqrxm", "sqrlxdh"], [4, 1, 3, 2, 1, 1, 3, 3, 1, 3]);
+        this.xqform.xqList[0].djpdSq = decryptData_ECB(this.xqform.xqList[0].djpdSq, ["sqrxm","sqrlxdh"], [1, 3])
+        this.xqform.xqList[3].djpdZj = decryptRowData_ECB(this.xqform.xqList[3].djpdZj, ["xm","zjhm","dh"], [1, 2, 3])
         // this.xqform.szlx = this.form.szlx ? this.xqform.szlx.split(",") : [];
         this.xqform.xqList.unshift(
           {

ruoyi-ui/src/views/business/fwjggl/djpd/xqPz/index.vue

@@ -161,7 +161,7 @@ export default {
     getList() {
       this.loading = true;
       listXqPz(this.queryParams).then(response => {
-        this.xqPzList = response.rows;
+        this.xqPzList = decryptRowData_ECB(response.rows, [], []);
         this.total = response.total;
         this.loading = false;
       });
@@ -209,7 +209,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getXqPz(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, [], []);
         /****** sks 需要改动的地方 start ******/
         this.copyForm=this.deepCopy(response.data)
         /****** sks 需要改动的地方 end ******/

ruoyi-ui/src/views/business/fwjggl/djpd/xzlr/index.vue

@@ -531,7 +531,7 @@ export default {
       getList() {
         this.loading = true
         listXzPd(this.queryParams).then((response) => {
-          this.djpdShList = response.rows
+          this.djpdShList = decryptRowData_ECB(response.rows, ["sqrxm","sqrlxdh"], [1, 3])
           this.total = response.total
           this.loading = false
         })
@@ -732,7 +732,7 @@ export default {
       //   this.reset()
       //   const id = row.id || this.ids
       //   getDjpdSq(id).then((response) => {
-      //     this.form = response.data
+      //     this.form = decryptData_ECB(response.data, [], [])
       //     this.form.szlx = this.form.szlx ? this.form.szlx.split(',') : []
       //     this.open = true
       //     this.title = '详情'
@@ -742,7 +742,9 @@ export default {
       handleUpdate(row) {
         this.details = {}
         getDjpdSqConfig(row.id, 'pdjgSh').then((response) => {
-          this.details = response.data
+          this.details = decryptData_ECB(response.data, ["txdz","frxm","frlxfs","frzjhm", "jglxrxm", "jgfzrxm", "jgfzrlxdh", "jglxdh", "sqrxm", "sqrlxdh"], [4, 1, 3, 2, 1, 1, 3, 3, 1, 3]);
+          this.details.xqList[0].djpdSq = decryptData_ECB(this.details.xqList[0].djpdSq, ["sqrxm","sqrlxdh"], [1, 3])
+          this.details.xqList[3].djpdZj = decryptRowData_ECB(this.details.xqList[3].djpdZj, ["xm","zjhm","dh"], [1, 2, 3])
           this.details.xqList.unshift(
             {
               'jg': {

ruoyi-ui/src/views/business/fwjggl/djpd/zsdqTx/index.vue

@@ -468,7 +468,7 @@ export default {
         this.queryParams.params["endSqsj"] = this.daterangeSqsj[1];
       }
       listDjpdTx(this.queryParams).then((response) => {
-        this.djzspbList = response.rows;
+        this.djzspbList = decryptRowData_ECB(response.rows, [], []);
         this.total = response.total;
         this.loading = false;
       });
@@ -541,7 +541,7 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getDjzspb(id).then((response) => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, [], []);
         /****** sks 需要改动的地方 start ******/
         this.copyForm = this.deepCopy(response.data);
         /****** sks 需要改动的地方 end ******/

ruoyi-ui/src/views/business/lhcj/cjmd/jgLhcjMd/index.vue

@@ -84,7 +84,7 @@
 
 <script>
 import {getJgLhcjMd, getJgLhcjMdHistory, listJgLhcjMd} from "@/api/business/lhcj/mdgl/jgLhcjMd";
-import {chineseOne, idCard} from '@/utils/regular'
+import {chineseOne, idCard, Mobile, ID, Phone, Name} from '@/utils/regular'
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
@@ -212,7 +212,7 @@ export default {
         this.queryParams.params["endNrrq"] = this.daterangeNrrq[1];
       }
       listJgLhcjMd(this.queryParams).then(response => {
-        this.jgLhcjMdList = response.rows;
+        this.jgLhcjMdList = decryptRowData_ECB(response.rows, ["frxm","lxdh","frzjhm","txdz"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -292,7 +292,10 @@ export default {
       }
 
       select(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
+        this.form.xqList[3].sb = decryptData_ECB(this.form.xqList[3].sb, ["xm","lxdh","zjhm"], [1, 3, 2]);
+        this.form.xqList[4].yc.yc = decryptData_ECB(this.form.xqList[4].yc.yc, ["xm","lxdh","zjhm"], [1, 3, 2]);
+        this.form.xqList[4].yc.ycyt = decryptData_ECB(this.form.xqList[4].yc.ycyt, ["xm","lxdh","zjhm","jlrxm"], [1, 3, 2, 1]); 
         this.form.xqList.unshift(
           {
             'jg': {

ruoyi-ui/src/views/business/lhcj/cjmd/ryLhcjMd/index.vue

@@ -83,7 +83,7 @@
 
 <script>
 import {getRyLhcjMd, getRyLhcjMdHistory, listRyLhcjMd} from "@/api/business/lhcj/mdgl/ryLhcjMd";
-import {chineseOne, idCard} from '@/utils/regular'
+import {chineseOne, idCard, Mobile, ID, Phone, Name} from '@/utils/regular'
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
@@ -207,7 +207,7 @@ export default {
         this.queryParams.params["endNrrq"] = this.daterangeNrrq[1];
       }
       listRyLhcjMd(this.queryParams).then(response => {
-        this.ryLhcjMdList = response.rows;
+        this.ryLhcjMdList = decryptRowData_ECB(response.rows, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -286,7 +286,10 @@ export default {
         select=getRyLhcjMdHistory
       }
       select(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
+        this.form.xqList[3].sb = decryptData_ECB(this.form.xqList[3].sb, ["xm","lxdh","zjhm"], [1, 3, 2]);
+        this.form.xqList[4].yc.yc = decryptData_ECB(this.form.xqList[4].yc.yc, ["xm","lxdh","zjhm"], [1, 3, 2]);
+        this.form.xqList[4].yc.ycyt = decryptData_ECB(this.form.xqList[4].yc.ycyt, ["xm","lxdh","zjhm","jlrxm"], [1, 3, 2, 1]); 
         this.form.xqList.unshift(
           {
             'ryxx': {

ruoyi-ui/src/views/business/lhcj/jgLhcj/gs/index.vue

@@ -200,7 +200,7 @@ export default {
     getList() {
       this.loading = true;
       listJgLhcjGs(this.queryParams).then(response => {
-        this.lhcjNrrdList = response.rows;
+        this.lhcjNrrdList = decryptRowData_ECB(response.rows, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -280,7 +280,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getJgLhcjGs(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
         /****** sks 需要改动的地方 start ******/
         // this.copyForm = this.deepCopy(response.data)
         /****** sks 需要改动的地方 end ******/

ruoyi-ui/src/views/business/lhcj/jgLhcj/gzs/index.vue

@@ -200,7 +200,7 @@ export default {
     getList() {
       this.loading = true;
       listJgLhcjGzs(this.queryParams).then(response => {
-        this.lhcjNrrdList = response.rows;
+        this.lhcjNrrdList = decryptRowData_ECB(response.rows, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -255,7 +255,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getJgLhcjGzs(id).then(async (response) => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
         this.form.taskId = row.taskId;
         this.form.sxxxId = row.id
         if (response.data.nrrd) {
@@ -286,7 +286,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getJgLhcjGzs(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
         if (response.data.nrrd) {
           this.form.cljg = response.data.nrrd.cljg;
           this.form.rdyj = response.data.nrrd.rdyj;

ruoyi-ui/src/views/business/lhcj/jgLhcj/gzsFk/index.vue

@@ -238,7 +238,7 @@ export default {
     getList() {
       this.loading = true;
       listJgLhcjGzsFk(this.queryParams).then(response => {
-        this.lhcjNrrdList = response.rows;
+        this.lhcjNrrdList = decryptRowData_ECB(response.rows, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -323,7 +323,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getJgLhcjGzsFk(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
         if (response.data.nrrd) {
           this.form.cljg = response.data.nrrd.cljg;
           this.form.rdyj = response.data.nrrd.rdyj;

ruoyi-ui/src/views/business/lhcj/jgLhcj/lhcjNrrd/index.vue

@@ -249,7 +249,7 @@ export default {
     getList() {
       this.loading = true;
       listJgLhcjNrrd(this.queryParams).then(response => {
-        this.lhcjNrrdList = response.rows;
+        this.lhcjNrrdList = decryptRowData_ECB(response.rows, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -305,7 +305,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getJgLhcjNrrd(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
         if (this.form.szxzqhIds) {
           this.form.szxzqh = JSON.stringify(this.form.szxzqhIds.split(","));
         } else {
@@ -328,6 +328,7 @@ export default {
         /****** sks 需要改动的地方 start ******/
         // this.copyForm = this.deepCopy(response.data)
         /****** sks 需要改动的地方 end ******/
+        this.form = decryptData_ECB(response.data, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
         this.form.xqList.unshift(
           {
             'jg': {

ruoyi-ui/src/views/business/lhcj/jgLhcj/sb/index.vue

@@ -141,7 +141,7 @@
 
 <script>
 import {addJgLhcjSb, getJgLhcjSb, listJgLhcjSb} from "@/api/business/lhcj/mdgl/lhcjSb";
-import {chineseOne, idCard} from '@/utils/regular'
+import {chineseOne, idCard, Mobile, ID, Phone, Name} from '@/utils/regular'
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
@@ -254,7 +254,7 @@ export default {
     getList() {
       this.loading = true;
       listJgLhcjSb(this.queryParams).then(response => {
-        this.lhcjNrrdList = response.rows;
+        this.lhcjNrrdList = decryptRowData_ECB(response.rows, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -340,10 +340,11 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getJgLhcjSb(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
         /****** sks 需要改动的地方 start ******/
         // this.copyForm = this.deepCopy(response.data)
         /****** sks 需要改动的地方 end ******/
+        this.form.xqList[3].sb = decryptData_ECB(this.form.xqList[3].sb, ["xm","lxdh","zjhm"], [1, 3, 2]);
         this.form.xqList.unshift(
           {
             'jg': {

ruoyi-ui/src/views/business/lhcj/jgLhcj/sbsh/index.vue

@@ -137,7 +137,7 @@
 
 <script>
 import {getJgLhcjSbSh, getLhcjSb, listJgLhcjSbSh, updateJgLhcjSb} from "@/api/business/lhcj/mdgl/lhcjSb";
-import {chineseOne, idCard} from '@/utils/regular'
+import {chineseOne, idCard, Mobile, ID, Phone, Name} from '@/utils/regular'
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
@@ -259,7 +259,7 @@ export default {
     getList() {
       this.loading = true;
       listJgLhcjSbSh(this.queryParams).then(response => {
-        this.lhcjNrrdList = response.rows;
+        this.lhcjNrrdList = decryptRowData_ECB(response.rows, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -335,7 +335,7 @@ export default {
     handleAdd(row) {
       this.resetFk();
       getLhcjSb(row.id).then(res => {
-        this.formFk = res.data;
+        this.formFk = decryptData_ECB(res.data, ["xm","lxdh","zjhm"], [1, 3, 2]);
         this.formFk.taskId = row.taskId;
         this.openFk = true;
         this.titleFk = "联合惩戒申辩信息";
@@ -346,10 +346,11 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getJgLhcjSbSh(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
         /****** sks 需要改动的地方 start ******/
         // this.copyForm = this.deepCopy(response.data)
         /****** sks 需要改动的地方 end ******/
+        this.form.xqList[3].sb = decryptData_ECB(this.form.xqList[3].sb, ["xm","lxdh","zjhm"], [1, 3, 2]);
         this.form.xqList.unshift(
           {
             'jg': {
@@ -372,6 +373,9 @@ export default {
     submitFormFk() {
       this.$refs["formFk"].validate(valid => {
         if (valid) {
+          this.formFk.xm = null;
+          this.formFk.lxdh = null;
+          this.formFk.zjhm = null;
           this.submitFormLoading = true;
           updateJgLhcjSb(this.formFk).then(response => {
             this.$modal.msgSuccess("审核成功");

ruoyi-ui/src/views/business/lhcj/jgLhcj/yc/index.vue

@@ -157,7 +157,7 @@
 
 <script>
 import {addJgLhcjYc, getJgLhcjYc, listJgLhcjYc} from "@/api/business/lhcj/mdgl/lhcjYc";
-import {chineseOne, idCard} from '@/utils/regular'
+import {chineseOne, idCard, Mobile, ID, Phone, Name} from '@/utils/regular'
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
@@ -315,7 +315,7 @@ export default {
     getList() {
       this.loading = true;
       listJgLhcjYc(this.queryParams).then(response => {
-        this.jgLhcjMdList = response.rows;
+        this.jgLhcjMdList = decryptRowData_ECB(response.rows, ["frxm","lxdh","frzjhm","txdz"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -413,7 +413,10 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getJgLhcjYc(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
+        this.form.xqList[3].sb = decryptData_ECB(this.form.xqList[3].sb, ["xm","lxdh","zjhm"], [1, 3, 2]);
+        this.form.xqList[4].yc.yc = decryptData_ECB(this.form.xqList[4].yc.yc, ["xm","lxdh","zjhm"], [1, 3, 2]);
+        this.form.xqList[4].yc.ycyt = decryptData_ECB(this.form.xqList[4].yc.ycyt, ["xm","lxdh","zjhm","jlrxm"], [1, 3, 2, 1]); 
         /****** sks 需要改动的地方 start ******/
         this.copyForm = this.deepCopy(response.data)
         /****** sks 需要改动的地方 end ******/

ruoyi-ui/src/views/business/lhcj/jgLhcj/ychc/index.vue

@@ -252,7 +252,7 @@ export default {
     getList() {
       this.loading = true;
       listJgLhcjYchc(this.queryParams).then(response => {
-        this.jgLhcjMdList = response.rows;
+        this.jgLhcjMdList = decryptRowData_ECB(response.rows, ["frxm","lxdh","frzjhm","txdz"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -350,7 +350,10 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getJgLhcjYc(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["frxm","lxdh","frzjhm","txdz"], [1, 3, 2, 4]);
+        this.form.xqList[3].sb = decryptData_ECB(this.form.xqList[3].sb, ["xm","lxdh","zjhm"], [1, 3, 2]);
+        this.form.xqList[4].yc.yc = decryptData_ECB(this.form.xqList[4].yc.yc, ["xm","lxdh","zjhm"], [1, 3, 2]);
+        this.form.xqList[4].yc.ycyt = decryptData_ECB(this.form.xqList[4].yc.ycyt, ["xm","lxdh","zjhm","jlrxm"], [1, 3, 2, 1]); 
         /****** sks 需要改动的地方 start ******/
         // this.copyForm = this.deepCopy(response.data)
         /****** sks 需要改动的地方 end ******/
@@ -376,7 +379,7 @@ export default {
     handleAdd(row) {
       this.resetYc();
       getLhcjYc(row.id).then(res => {
-        this.formYc = res.data;
+        this.formYc = decryptData_ECB(res.data, ["xm","lxdh","zjhm"], [1, 3, 2]);
         this.openYc = true;
         this.titleYc = "联合惩戒移出信息";
       })
@@ -384,7 +387,7 @@ export default {
     handlePrt(row) {
       this.resetYc();
       getLhcjYc(row.id).then(res => {
-        this.formYc = res.data;
+        this.formYc = decryptData_ECB(res.data, ["xm","lxdh","zjhm"], [1, 3, 2]);
         this.openDy = true;
         this.title = "打印预览";
       })
@@ -392,6 +395,9 @@ export default {
     submitFormYc() {
       this.$refs["formYc"].validate(valid => {
         if (valid) {
+          this.formYc.xm = null;
+          this.formYc.lxdh = null;
+          this.formYc.zjhm = null;
           this.submitFormLoading = true;
           updateJgLhcjYc(this.formYc).then(response => {
             this.$modal.msgSuccess("核查成功");

ruoyi-ui/src/views/business/lhcj/jgLhcj/ycyt/index.vue

@@ -127,7 +127,7 @@
 <script>
 import {addJgLhcjYcyt, listJgLhcjYcyt} from "@/api/business/lhcj/mdgl/lhcjYcyt";
 import {getJgLhcjYc} from "@/api/business/lhcj/mdgl/lhcjYc";
-import {chineseOne, idCard} from '@/utils/regular'
+import {chineseOne, idCard, Mobile, ID, Phone, Name} from '@/utils/regular'
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
@@ -290,7 +290,7 @@ export default {
     getList() {
       this.loading = true;
       listJgLhcjYcyt(this.queryParams).then(response => {
-        this.jgLhcjMdList = response.rows;
+        this.jgLhcjMdList = decryptRowData_ECB(response.rows, ["frxm","lxdh","frzjhm","txdz"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -384,7 +384,10 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getJgLhcjYc(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["frxm","lxdh","frzjhm","txdz"], [1, 3, 2, 4]);
+        this.form.xqList[3].sb = decryptData_ECB(this.form.xqList[3].sb, ["xm","lxdh","zjhm"], [1, 3, 2]);
+        this.form.xqList[4].yc.yc = decryptData_ECB(this.form.xqList[4].yc.yc, ["xm","lxdh","zjhm"], [1, 3, 2]);
+        this.form.xqList[4].yc.ycyt = decryptData_ECB(this.form.xqList[4].yc.ycyt, ["xm","lxdh","zjhm","jlrxm"], [1, 3, 2, 1]); 
         /****** sks 需要改动的地方 start ******/
         this.copyForm = this.deepCopy(response.data)
         /****** sks 需要改动的地方 end ******/

ruoyi-ui/src/views/business/lhcj/ryLhcj/gs/index.vue

@@ -199,7 +199,7 @@ export default {
     getList() {
       this.loading = true;
       listRyLhcjGs(this.queryParams).then(response => {
-        this.lhcjNrrdList = response.rows;
+        this.lhcjNrrdList = decryptRowData_ECB(response.rows, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -279,7 +279,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getRyLhcjGs(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.form.xqList.unshift(
           {
             'ryxx': {

ruoyi-ui/src/views/business/lhcj/ryLhcj/gzs/index.vue

@@ -211,7 +211,7 @@ export default {
     getList() {
       this.loading = true;
       listRyLhcjGzs(this.queryParams).then(response => {
-        this.lhcjNrrdList = response.rows;
+        this.lhcjNrrdList = decryptRowData_ECB(response.rows, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -266,7 +266,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getRyLhcjGzs(id).then(async(response) => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.form.taskId = row.taskId;
         this.form.sxxxId = row.id;
         if (response.data.nrrd) {
@@ -297,7 +297,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getRyLhcjGzs(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.form.xqList.unshift(
           {
             'ryxx': {

ruoyi-ui/src/views/business/lhcj/ryLhcj/gzsFk/index.vue

@@ -236,7 +236,7 @@ export default {
     getList() {
       this.loading = true;
       listRyLhcjGzsFk(this.queryParams).then(response => {
-        this.lhcjNrrdList = response.rows;
+        this.lhcjNrrdList = decryptRowData_ECB(response.rows, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -322,7 +322,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getRyLhcjGzsFk(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.form.xqList.unshift(
           {
             'ryxx': {

ruoyi-ui/src/views/business/lhcj/ryLhcj/lhcjNrrd/index.vue

@@ -232,7 +232,7 @@ export default {
     getList() {
       this.loading = true;
       listRyLhcjNrrd(this.queryParams).then(response => {
-        this.lhcjNrrdList = response.rows;
+        this.lhcjNrrdList = decryptRowData_ECB(response.rows, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -288,7 +288,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getRyLhcjNrrd(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         if (this.form.szxzqhIds) {
           this.form.szxzqh = JSON.stringify(this.form.szxzqhIds.split(","));
         } else {
@@ -310,7 +310,7 @@ export default {
         /****** sks 需要改动的地方 start ******/
         // this.copyForm = this.deepCopy(response.data)
         /****** sks 需要改动的地方 end ******/
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.form.xqList.unshift(
           {
             'ryxx': {

ruoyi-ui/src/views/business/lhcj/ryLhcj/sb/index.vue

@@ -138,7 +138,7 @@
 
 <script>
 import {addRyLhcjSb, getRyLhcjSb, listRyLhcjSb} from "@/api/business/lhcj/mdgl/lhcjSb";
-import {chineseOne, idCard} from '@/utils/regular'
+import {chineseOne, idCard, Mobile, ID, Phone, Name} from '@/utils/regular'
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
@@ -251,7 +251,7 @@ export default {
     getList() {
       this.loading = true;
       listRyLhcjSb(this.queryParams).then(response => {
-        this.lhcjNrrdList = response.rows;
+        this.lhcjNrrdList = decryptRowData_ECB(response.rows, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -337,7 +337,8 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getRyLhcjSb(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
+        this.form.xqList[3].sb = decryptData_ECB(this.form.xqList[3].sb, ["xm","lxdh","zjhm"], [1, 3, 2]);
         this.form.xqList.unshift(
           {
             'ryxx': {

ruoyi-ui/src/views/business/lhcj/ryLhcj/sbsh/index.vue

@@ -137,7 +137,7 @@
 
 <script>
 import {getLhcjSb, getRyLhcjSbSh, listRyLhcjSbSh, updateRyLhcjSb} from "@/api/business/lhcj/mdgl/lhcjSb";
-import {chineseOne, idCard} from '@/utils/regular'
+import {chineseOne, idCard, Mobile, ID, Phone, Name} from '@/utils/regular'
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
@@ -259,7 +259,7 @@ export default {
     getList() {
       this.loading = true;
       listRyLhcjSbSh(this.queryParams).then(response => {
-        this.lhcjNrrdList = response.rows;
+        this.lhcjNrrdList = decryptRowData_ECB(response.rows, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -335,7 +335,7 @@ export default {
     handleAdd(row) {
       this.resetFk();
       getLhcjSb(row.id).then(res => {
-        this.formFk = res.data;
+        this.formFk = decryptData_ECB(res.data, ["xm","lxdh","zjhm"], [1, 3, 2]);
         this.formFk.taskId = row.taskId;
         this.openFk = true;
         this.titleFk = "联合惩戒申辩信息";
@@ -346,7 +346,8 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getRyLhcjSbSh(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
+        this.form.xqList[3].sb = decryptData_ECB(this.form.xqList[3].sb, ["xm","lxdh","zjhm"], [1, 3, 2]);
         this.form.xqList.unshift(
           {
             'ryxx': {
@@ -372,6 +373,9 @@ export default {
     submitFormFk() {
       this.$refs["formFk"].validate(valid => {
         if (valid) {
+          this.formFk.xm = null;
+          this.formFk.zjhm = null;
+          this.formFk.lxdh = null;
           this.submitFormLoading = true;
           updateRyLhcjSb(this.formFk).then(response => {
             this.$modal.msgSuccess("审核成功");

ruoyi-ui/src/views/business/lhcj/ryLhcj/yc/index.vue

@@ -157,7 +157,7 @@
 
 <script>
 import {addRyLhcjYc, getRyLhcjYc, listRyLhcjYc} from "@/api/business/lhcj/mdgl/lhcjYc";
-import {chineseOne, idCard} from '@/utils/regular'
+import {chineseOne, idCard, Mobile, ID, Phone, Name} from '@/utils/regular'
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
@@ -311,7 +311,7 @@ export default {
     getList() {
       this.loading = true;
       listRyLhcjYc(this.queryParams).then(response => {
-        this.ryLhcjMdList = response.rows;
+        this.ryLhcjMdList = decryptRowData_ECB(response.rows, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -409,7 +409,10 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getRyLhcjYc(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
+        this.form.xqList[3].sb = decryptData_ECB(this.form.xqList[3].sb, ["xm","lxdh","zjhm"], [1, 3, 2]);
+        this.form.xqList[4].yc.yc = decryptData_ECB(this.form.xqList[4].yc.yc, ["xm","lxdh","zjhm"], [1, 3, 2]);
+        this.form.xqList[4].yc.ycyt = decryptData_ECB(this.form.xqList[4].yc.ycyt, ["xm","lxdh","zjhm","jlrxm"], [1, 3, 2, 1]); 
         this.form.xqList.unshift(
           {
             'ryxx': {

ruoyi-ui/src/views/business/lhcj/ryLhcj/ychc/index.vue

@@ -265,7 +265,7 @@ export default {
     getList() {
       this.loading = true;
       listRyLhcjYchc(this.queryParams).then(response => {
-        this.ryLhcjMdList = response.rows;
+        this.ryLhcjMdList = decryptRowData_ECB(response.rows, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -363,7 +363,10 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getRyLhcjYc(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
+        this.form.xqList[3].sb = decryptData_ECB(this.form.xqList[3].sb, ["xm","lxdh","zjhm"], [1, 3, 2]);
+        this.form.xqList[4].yc.yc = decryptData_ECB(this.form.xqList[4].yc.yc, ["xm","lxdh","zjhm"], [1, 3, 2]);
+        this.form.xqList[4].yc.ycyt = decryptData_ECB(this.form.xqList[4].yc.ycyt, ["xm","lxdh","zjhm","jlrxm"], [1, 3, 2, 1]); 
         this.form.xqList.unshift(
           {
             'ryxx': {
@@ -390,7 +393,7 @@ export default {
       this.resetYc();
       this.resetYc();
       getLhcjYc(row.id).then(res => {
-        this.formYc = res.data;
+        this.formYc = decryptData_ECB(res.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.openYc = true;
         this.titleYc = "联合惩戒移出信息";
       })
@@ -398,7 +401,7 @@ export default {
     handlePrt(row) {
       this.resetYc();
       getLhcjYc(row.id).then(async (res) => {
-        this.formYc = res.data;
+        this.formYc = decryptData_ECB(res.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.openDy = true;
         this.formYc.taskId = row.taskId;
         this.formYc.sxxxId = row.id;
@@ -410,6 +413,9 @@ export default {
     submitFormYc() {
       this.$refs["formYc"].validate(valid => {
         if (valid) {
+          this.formYc.xm = null;
+          this.formYc.lxdh = null;
+          this.formYc.zjhm = null;
           this.submitFormLoading = true;
           updateRyLhcjYc(this.formYc).then(response => {
             this.$modal.msgSuccess("核查成功");

ruoyi-ui/src/views/business/lhcj/ryLhcj/ycyt/index.vue

@@ -126,7 +126,7 @@
 <script>
 import {addRyLhcjYcyt, listRyLhcjYcyt} from "@/api/business/lhcj/mdgl/lhcjYcyt";
 import {getRyLhcjYc} from "@/api/business/lhcj/mdgl/lhcjYc";
-import {chineseOne, idCard} from '@/utils/regular'
+import {chineseOne, idCard, Mobile, ID, Phone, Name} from '@/utils/regular'
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
@@ -285,7 +285,7 @@ export default {
     getList() {
       this.loading = true;
       listRyLhcjYcyt(this.queryParams).then(response => {
-        this.ryLhcjMdList = response.rows;
+        this.ryLhcjMdList = decryptRowData_ECB(response.rows, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -379,7 +379,10 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getRyLhcjYc(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
+        this.form.xqList[3].sb = decryptData_ECB(this.form.xqList[3].sb, ["xm","lxdh","zjhm"], [1, 3, 2]);
+        this.form.xqList[4].yc.yc = decryptData_ECB(this.form.xqList[4].yc.yc, ["xm","lxdh","zjhm"], [1, 3, 2]);
+        this.form.xqList[4].yc.ycyt = decryptData_ECB(this.form.xqList[4].yc.ycyt, ["xm","lxdh","zjhm","jlrxm"], [1, 3, 2, 1]); 
         this.form.xqList.unshift(
           {
             'ryxx': {

ruoyi-ui/src/views/business/lhcj/sxxx/cyrySxxx/index.vue

@@ -288,7 +288,7 @@ import {
   listCyrySxxx,
   updateCyrySxxx,
 } from "@/api/business/lhcj/sxxx/cyrySxxx";
-import { chineseOne, idCard, Regular } from "@/utils/regular";
+import { chineseOne, idCard, Regular, Mobile } from "@/utils/regular";
 import { getToken } from '@/utils/auth';
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
@@ -359,7 +359,7 @@ export default {
         lxdh: [
           { required: true, message: "人员联系电话不能为空", trigger: "blur" },
           // { max: 18, message: "人员联系电话不能超过18个字符", trigger: "blur" },
-          { pattern: Regular.Mobile, message: '号码格式：131xxxxxxxx或010-88xxxxx', trigger: 'blur' }
+          { validator: Mobile, trigger: 'blur' }
         ],
         rylb: [
           { required: true, message: "人员类别不能为空", trigger: "change" },
@@ -439,7 +439,7 @@ export default {
     getList() {
       this.loading = true;
       listCyrySxxx(this.queryParams).then((response) => {
-        this.cyrySxxxList = response.rows;
+        this.cyrySxxxList = decryptRowData_ECB(response.rows, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -510,7 +510,7 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getCyrySxxx(id).then((response) => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4]);
         if (this.form.szxzqhIds) {
           this.form.szxzqh = JSON.stringify(this.form.szxzqhIds.split(","));
         } else {
@@ -526,7 +526,7 @@ export default {
     /** 详细 */
     handleDetails(row) {
       getCyrySxxx(row.id).then(response => {
-        this.dataDetails = response.data
+        this.dataDetails = decryptData_ECB(response.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4])
         this.openXQ = true
       })
     },

ruoyi-ui/src/views/business/lhcj/sxxx/yljgSxxx/index.vue

@@ -274,7 +274,7 @@ import {
   startYljgSxxx,
   updateYljgSxxx
 } from "@/api/business/lhcj/sxxx/yljgSxxx";
-import { chineseOne, idCard, Regular } from '@/utils/regular'
+import { chineseOne, idCard, Regular , Mobile, ID, Phone, Name} from '@/utils/regular'
 import { getToken } from "@/utils/auth";
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
@@ -351,7 +351,7 @@ export default {
         lxdh: [
           { required: true, message: "联系电话不能为空", trigger: "blur" },
           // { max: 18, message: '联系电话不能超过18个字符', trigger: 'blur' },
-          { pattern: Regular.Mobile, message: '号码格式：131xxxxxxxx或010-88xxxxx', trigger: 'blur' }
+          { validator: Mobile, trigger: 'blur' }
         ],
         frxm: [
           { required: true, message: "法定代表人姓名不能为空", trigger: "blur" },
@@ -411,7 +411,7 @@ export default {
     getList() {
       this.loading = true;
       listYljgSxxx(this.queryParams).then(response => {
-        this.yljgSxxxList = response.rows;
+        this.yljgSxxxList = decryptRowData_ECB(response.rows, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
         this.total = response.total;
         this.loading = false;
       });
@@ -481,7 +481,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getYljgSxxx(id).then(response => {
-        this.form = response.data;
+        this.form = decryptData_ECB(response.data, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4]);
         if (this.form.szxzqhIds) {
           this.form.szxzqh = JSON.stringify(this.form.szxzqhIds.split(","));
         } else {
@@ -497,7 +497,7 @@ export default {
     /** 详细 */
     handleDetails(row) {
       getYljgSxxx(row.id).then(response => {
-        this.dataDetails = response.data
+        this.dataDetails = decryptData_ECB(response.data, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4])
         this.openXQ = true
       })
     },

ruoyi-ui/src/views/business/lhcj/zdgz/cyryZdgz/index.vue

@@ -100,7 +100,7 @@
               <td>行政区划</td>
               <td>{{form.szxzqhNames}}</td>
               <td>通信地址</td>
-              <td>{{form.txms}}</td>
+              <td>{{form.txdz}}</td>
             </tr>
           </table>
         </el-tab-pane>
@@ -342,8 +342,8 @@ import {
   addCyryZdgzZc,
   updateCyryZdgz
 } from '@/api/business/lhcj/mdgl/cyryZdgz'
-import {chineseOne, idCard} from '@/utils/regular'
-import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
+import {chineseOne, idCard, Mobile, ID, Phone, Name} from '@/utils/regular'
+import { decryptData_ECB, decryptRowData_ECB, decrypt_ECB } from "@/api/tool/sm4";
 
 export default {
     name: 'CyryZdgz',
@@ -537,7 +537,7 @@ export default {
         }
         this.queryParams.params = params
         listCyrySxxxZdgz(this.queryParams).then(response => {
-          this.cyryZdgzList = response.rows
+          this.cyryZdgzList = decryptRowData_ECB(response.rows, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4])
           this.total = response.total
           this.loading = false
         })
@@ -615,6 +615,11 @@ export default {
         this.open = true
         this.isXQ = false;
         getCyryZdgz(row.id).then(res => {
+          this.form.Mxm = decrypt_ECB(res.data.xm)
+          this.form.Mlxdh = decrypt_ECB(res.data.lxdh)
+          this.form.Mzjhm = decrypt_ECB(res.data.zjhm)
+          this.form.Mtxdz = decrypt_ECB(res.data.txdz)
+          res.data = decryptData_ECB(res.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4])
           if (res.data.cljg) {
             this.form.cljg = res.data.cljg;
             this.form.bnryy = res.data.bnryy;
@@ -656,7 +661,11 @@ export default {
         this.reset()
         const id = row.id || this.ids
         getCyryZdgz(id).then(response => {
-          this.form = response.data
+          this.form.Mxm = decrypt_ECB(response.data.xm)
+          this.form.Mlxdh = decrypt_ECB(response.data.lxdh)
+          this.form.Mzjhm = decrypt_ECB(response.data.zjhm)
+          this.form.Mtxdz = decrypt_ECB(response.data.txdz)
+          this.form = decryptData_ECB(response.data, ["xm","lxdh","zjhm","txdz"], [1, 3, 2, 4])
           this.form.tknr = response.data.tknr.split(',')
           if (this.form.szxzqhIds) {
             this.form.szxzqh = JSON.stringify(this.form.szxzqhIds.split(','))
@@ -687,6 +696,10 @@ export default {
         this.$refs['form'].validate(valid => {
           if (valid) {
             this.submitFormLoading = true
+            this.form.xm = this.form.Mxm
+            this.form.lxdh = this.form.Mlxdh
+            this.form.zjhm = this.form.Mzjhm
+            this.form.txdz = this.form.Mtxdz
             const param = {
               tknr: this.form.tknr.join(',')
             }
@@ -739,6 +752,10 @@ export default {
       submitFormZc() {
         this.$refs['form'].validate(valid => {
           if (valid) {
+            this.form.xm = this.form.Mxm
+            this.form.lxdh = this.form.Mlxdh
+            this.form.zjhm = this.form.Mzjhm
+            this.form.txdz = this.form.Mtxdz
             this.submitFormLoading = true
             const param = {
               tknr: this.form.tknr.join(',')

ruoyi-ui/src/views/business/lhcj/zdgz/yljgZdgz/index.vue

@@ -310,8 +310,8 @@ import {
   listYljgSxxxZdgz,
   updateYljgZdgz
 } from '@/api/business/lhcj/mdgl/yljgZdgz'
-import {chineseOne, idCard} from '@/utils/regular'
-import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
+import {chineseOne, idCard, Mobile, ID, Phone, Name} from '@/utils/regular'
+import { decryptData_ECB, decryptRowData_ECB, decrypt_ECB } from "@/api/tool/sm4";
 
 export default {
     name: 'YljgZdgz',
@@ -500,7 +500,7 @@ export default {
         }
         this.queryParams.params = params
         listYljgSxxxZdgz(this.queryParams).then(response => {
-          this.yljgZdgzList = response.rows
+          this.yljgZdgzList = decryptRowData_ECB(response.rows, ["frxm","lxdh","frzjhm","txdzms"], [1, 3, 2, 4])
           this.total = response.total
           this.loading = false
         })
@@ -580,6 +580,11 @@ export default {
         this.open = true
         this.isXQ = false;
         getYljgZdgz(row.id).then(res => {
+          this.form.Mlxdh = decrypt_ECB(res.data.lxdh)
+          this.form.Mfrxm = decrypt_ECB(res.data.frxm)
+          this.form.Mfrzjhm = decrypt_ECB(res.data.frzjhm)
+          this.form.Mtxms = decrypt_ECB(res.data.txms)
+          res.data = decryptData_ECB(res.data, ["frxm","lxdh","frzjhm","txms"], [1, 3, 2, 4])
           if (res.data.cljg) {
             this.form.cljg = res.data.cljg;
             this.form.bnryy = res.data.bnryy;
@@ -621,7 +626,11 @@ export default {
         this.reset()
         const id = row.id || this.ids
         getYljgZdgz(id).then(response => {
-          this.form = response.data
+          this.form.Mlxdh = decrypt_ECB(response.data.lxdh)
+          this.form.Mfrxm = decrypt_ECB(response.data.frxm)
+          this.form.Mfrzjhm = decrypt_ECB(response.data.frzjhm)
+          this.form.Mtxms = decrypt_ECB(response.data.txms)
+          this.form = decryptData_ECB(response.data, ["frxm","lxdh","frzjhm","txms"], [1, 3, 2, 4])
           this.form.tknr = response.data.tknr.split(',')
           if (this.form.szxzqhIds) {
             this.form.szxzqh = JSON.stringify(this.form.szxzqhIds.split(','))
@@ -653,6 +662,10 @@ export default {
       submitForm() {
         this.$refs['form'].validate(valid => {
           if (valid) {
+            this.form.frxm = this.form.Mfrxm;
+            this.form.frzjhm = this.form.Mfrzjhm;
+            this.form.lxdh = this.form.Mlxdh;
+            this.form.txms = this.form.Mtxms;
             this.submitFormLoading = true
             const param = {
               tknr: this.form.tknr.join(',')
@@ -699,6 +712,10 @@ export default {
       submitFormZc() {
         this.$refs['form'].validate(valid => {
           if (valid) {
+            this.form.frxm = this.form.Mfrxm;
+            this.form.frzjhm = this.form.Mfrzjhm;
+            this.form.lxdh = this.form.Mlxdh;
+            this.form.txms = this.form.Mtxms;
             this.submitFormLoading = true
             const param = {
               tknr: this.form.tknr.join(',')