Merge branch '陈航-修改监管-除统计问题' of sckj/mz-cloud into master

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

@@ -42,7 +42,7 @@ public class YljgQtaqzcController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(YljgQtaqzc yljgQtaqzc)
     {
-        if(!SecurityUtils.getUserType().equals("00")){
+        if(!"00".equals(SecurityUtils.getUserType())){
             yljgQtaqzc.setIsJc("0"); // 机构自查
         }
         startPage();
@@ -106,7 +106,7 @@ public class YljgQtaqzcController extends BaseController
     public AjaxResult add(@Validated({AddGroup.class}) @RequestBody YljgQtaqzc yljgQtaqzc)
     {
         yljgQtaqzc.setIsLast("1");
-        if(SecurityUtils.getUserType().equals("00")){
+        if("00".equals(SecurityUtils.getUserType())){
             yljgQtaqzc.setIsJc("1");
         }else{
             yljgQtaqzc.setIsJc("0");

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

@@ -42,7 +42,7 @@ public class YljgXfaqzcxxController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(YljgXfaqzcxx yljgXfaqzcxx)
     {
-        if(!SecurityUtils.getUserType().equals("00")){ // 机构自查
+        if(!"00".equals(SecurityUtils.getUserType())){ // 机构自查
             yljgXfaqzcxx.setIsJc("0");
         }
         if(StringUtils.isNotNull(yljgXfaqzcxx.getJgId())){ // 如果是【自查记录】，则不要暂存信息
@@ -110,7 +110,7 @@ public class YljgXfaqzcxxController extends BaseController
     @PostMapping
     public AjaxResult add(@Validated({AddGroup.class}) @RequestBody YljgXfaqzcxx yljgXfaqzcxx)
     {
-        if(SecurityUtils.getUserType().equals("00")){
+        if("00".equals(SecurityUtils.getUserType())){
             yljgXfaqzcxx.setIsJc("1");
         }else{
             yljgXfaqzcxx.setIsJc("0");

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/mapper/ZwywJgBnMapper.java

@@ -35,6 +35,7 @@ public interface ZwywJgBnMapper extends BaseMapperPlus<ZwywJgBn> {
     public List<ZwywJgBn> selectOneZwywBnByLzzt(ZwywJgBn zwywJgBn);
 
     public List<ZwywJgBn> selectZwywBnList(ZwywJgBn zwywJgBn);
+    public List<ZwywJgBn> selectZwywJgBnList(ZwywJgBn zwywJgBn);
     public List<ZwywJgBn> selectZwywBnListByHis(ZwywJgBn zwywJgBn);
     public List<ZwywJgBn> selectZwywJgBnGroupList(ZwywJgBn zwywJgBn);
     public ZwywJgBn selectZwywBnListById(String id);

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

@@ -56,7 +56,7 @@ public class ZwywJgBnServiceImpl implements IZwywJgBnService
     public ZwywJgBn selectZwywJgBnById(String id)
     {
         ZwywJgBn zwywJgBn = zwywJgBnMapper.selectById(id);
-        if(SecurityUtils.getUserType().equals("01") && SecurityUtils.getJgId().equals(zwywJgBn.getJgId())){
+        if("01".equals(SecurityUtils.getUserType()) && SecurityUtils.getJgId().equals(zwywJgBn.getJgId())){
             if(!zwywJgBn.getSqqd().equals("4")){
                 throw new ServiceException("不允许修改上级用户的备案信息");
             }
@@ -155,10 +155,14 @@ public class ZwywJgBnServiceImpl implements IZwywJgBnService
         if("3".equals(zwywJgBn.getBnCxzt())){
             return zwywJgBnMapper.selectZwywBnListByBgCx(zwywJgBn);
         } else {
-            if (StringUtils.isBlank(zwywJgBn.getJgId())){
-                return zwywJgBnMapper.selectZwywBnList(zwywJgBn);
-            }else {
-                return zwywJgBnMapper.selectZwywBnListByHis(zwywJgBn);
+            if("01".equals(SecurityUtils.getUserType())){
+                return zwywJgBnMapper.selectZwywJgBnList(zwywJgBn);
+            }else{
+                if (StringUtils.isBlank(zwywJgBn.getJgId())){
+                    return zwywJgBnMapper.selectZwywBnList(zwywJgBn);
+                }else {
+                    return zwywJgBnMapper.selectZwywBnListByHis(zwywJgBn);
+                }
             }
         }
 

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

@@ -122,6 +122,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY IF(bn_lzzt IN ('00','01'),1,2) ASC,a.create_time_str DESC
     </select>
 
+    <select id="selectZwywJgBnList" parameterType="ZwywJgBn" resultMap="ZwywJgBnResult">
+        SELECT
+        getxzqhmcbycode(a.szxzqh) szxzqh_name,
+        getxzqhmcbycode(a.ssxzqh) ssxzqh_name,
+        a.*
+        FROM zwyw_jg_bn a
+        <where>
+            <if test="bnLzzt != null  and bnLzzt != ''"> and a.bn_lzzt = #{bnLzzt}</if>
+            <if test="bnCjzt != null  and bnCjzt != ''"> and a.bn_cjzt = #{bnCjzt}</if>
+            <if test="bnCxzt == 1"> AND a.bn_lzzt in ('04','05','06','08') </if>
+            <if test="bnCxzt == 2"> AND a.bn_lzzt in ('04','06') </if>
+        </where>
+        ORDER BY a.create_time_str DESC
+    </select>
+
+
     <select id="selectZwywBnListByBgCx" parameterType="ZwywJgBn" resultMap="ZwywJgBnResult">
         SELECT
         getxzqhmcbycode(a.szxzqh) szxzqh_name,

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/domain/YljgLryp.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 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;
@@ -113,4 +114,9 @@ public class YljgLryp extends BaseEntity
     @TableField(exist = false)
     private String isBj;
 
+    @ApiModelProperty(value = "通信地址")
+    @TableField(exist = false)
+    @EncryptionV
+    private String txdz;
+
 }

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/mapper/YljgLrypMapper.java

@@ -28,6 +28,8 @@ public interface YljgLrypMapper extends BaseMapperPlus<YljgLryp>
      * @return 老人用品
      */
     public YljgLryp selectYljgLrypById(String id);
+    public YljgLryp selectYljgLrypByJgId(String id);
+    public YljgLryp selectYljgLrypBySqJgId(String id);
 
     /**
      * 查询老人用品列表
@@ -36,6 +38,7 @@ public interface YljgLrypMapper extends BaseMapperPlus<YljgLryp>
      * @return 老人用品集合
      */
     public List<YljgLryp> selectYljgLrypList(YljgLryp yljgLryp);
+    public List<YljgLryp> selectSqYljgLrypList(YljgLryp yljgLryp);
 
     /**
      * 新增老人用品

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/service/impl/YljgLrypServiceImpl.java

@@ -31,7 +31,11 @@ public class YljgLrypServiceImpl implements IYljgLrypService
     @Override
     public YljgLryp selectYljgLrypById(String id)
     {
-        return yljgLrypMapper.selectYljgLrypById(id);
+        if("01".equals(SecurityUtils.getUserType())){
+            return yljgLrypMapper.selectYljgLrypByJgId(id);
+        }else{
+            return yljgLrypMapper.selectYljgLrypBySqJgId(id);
+        }
     }
 
     /**
@@ -43,7 +47,11 @@ public class YljgLrypServiceImpl implements IYljgLrypService
     @Override
     public List<YljgLryp> selectYljgLrypList(YljgLryp yljgLryp)
     {
-        return yljgLrypMapper.selectYljgLrypList(yljgLryp);
+        if("01".equals(yljgLryp.getCreateUserType())){
+            return yljgLrypMapper.selectYljgLrypList(yljgLryp);
+        }else{
+            return yljgLrypMapper.selectSqYljgLrypList(yljgLryp);
+        }
     }
 
     /**

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgLrypMapper.xml

@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateUnit"    column="update_unit"    />
         <result property="updateUnitName"    column="update_unit_name"    />
+        <result property="txdz"    column="txdz"    />
 
     </resultMap>
 
@@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         IFNULL(b.jgmc,c.jgmc) as jgmc,
         IFNULL(b.tyshxydm, c.tyshxydm) as tyshxydm,
-        IF(LENGTH(getxzqhmcbycode(b.szxzqh))>0,getxzqhmcbycode(b.szxzqh),getxzqhmcbycode(c.szxzqh)) as szxzqh_name,
+        IF(LENGTH(getxzqhmcbycode(b.szxzqh))>0,CONCAT(getxzqhmcbycode(b.szxzqh),b.txdz),CONCAT(getxzqhmcbycode(c.szxzqh),c.txdz)) as szxzqh_name,
         a.*
         FROM yljg_lryp a
         LEFT JOIN yljg_jcxx b ON a.jg_id = b.id
@@ -44,17 +45,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectYljgLrypList" parameterType="YljgLryp" resultMap="YljgLrypResult">
-        <include refid="selectYljgLrypVo"/>
+        SELECT
+        b.jgmc,b.tyshxydm,
+        getxzqhmcbycode(b.szxzqh) as szxzqh_name,
+        a.*
+        FROM yljg_lryp a
+        LEFT JOIN yljg_jcxx b ON a.jg_id = b.id
+        <where>
+            b.sczt = '01'
+            AND a.state = '1'
+            <if test="tyshxydm != null and tyshxydm != ''"> and b.tyshxydm like concat('%', #{tyshxydm}, '%')</if>
+            <if test="jgmc != null  and jgmc != ''"> and b.jgmc like concat('%', #{jgmc}, '%')</if>
+            <if test="lrypmc != null  and lrypmc != ''"> and a.lrypmc like concat('%', #{lrypmc}, '%')</if>
+            <if test="jgId != null  and jgId != ''"> and a.jg_id = #{jgId}</if>
+            <if test="lryplx != null  and lryplx != ''"> and a.lryplx = #{lryplx}</if>
+            <if test="ypsccs != null  and ypsccs != ''"> and a.ypsccs like concat('%',#{ypsccs},'%')</if>
+            <if test="xzqhId != null and isBj == null"> and b.ssxzqh IN ( SELECT CODE FROM SYS_DEPT_JL WHERE FIND_IN_SET(#{xzqhId},ancestors) OR CODE = #{xzqhId} )</if>
+            <if test="xzqhId != null and isBj == 0"> and b.ssxzqh IN ( SELECT CODE FROM SYS_DEPT_JL WHERE FIND_IN_SET(#{xzqhId},ancestors) OR CODE = #{xzqhId} )</if>
+            <if test="xzqhId != null and isBj == 1"> and b.ssxzqh = #{xzqhId}</if>
+            <if test="createUserType != null  and createUserType != ''"> and a.create_user_type = #{createUserType}</if>
+        </where>
+        ORDER BY a.create_time_str DESC
+    </select>
+
+    <select id="selectSqYljgLrypList" parameterType="YljgLryp" resultMap="YljgLrypResult">
+        SELECT
+        b.jgmc,b.tyshxydm,
+        getxzqhmcbycode(b.szxzqh) as szxzqh_name,
+        a.*
+        FROM yljg_lryp a
+        LEFT JOIN yljgsq_jcxx b ON a.jg_id = b.id
         <where>
-            <if test="tyshxydm != null and tyshxydm != ''"> and IFNULL(b.tyshxydm, c.tyshxydm) like concat('%', #{tyshxydm}, '%')</if>
-            <if test="jgmc != null  and jgmc != ''"> and IFNULL(b.jgmc, c.jgmc) like concat('%', #{jgmc}, '%')</if>
+            b.sczt = '01'
+            AND a.state = '1'
+            <if test="tyshxydm != null and tyshxydm != ''"> and b.tyshxydm like concat('%', #{tyshxydm}, '%')</if>
+            <if test="jgmc != null  and jgmc != ''"> and b.jgmc like concat('%', #{jgmc}, '%')</if>
             <if test="lrypmc != null  and lrypmc != ''"> and a.lrypmc like concat('%', #{lrypmc}, '%')</if>
             <if test="jgId != null  and jgId != ''"> and a.jg_id = #{jgId}</if>
             <if test="lryplx != null  and lryplx != ''"> and a.lryplx = #{lryplx}</if>
             <if test="ypsccs != null  and ypsccs != ''"> and a.ypsccs like concat('%',#{ypsccs},'%')</if>
-            <if test="xzqhId != null and isBj == null"> and IFNULL(b.ssxzqh,c.ssxzqh) IN ( SELECT CODE FROM SYS_DEPT_JL WHERE FIND_IN_SET(#{xzqhId},ancestors) OR CODE = #{xzqhId} )</if>
-            <if test="xzqhId != null and isBj == 0"> and IFNULL(b.ssxzqh,c.ssxzqh) IN ( SELECT CODE FROM SYS_DEPT_JL WHERE FIND_IN_SET(#{xzqhId},ancestors) OR CODE = #{xzqhId} )</if>
-            <if test="xzqhId != null and isBj == 1"> and IFNULL(b.ssxzqh,c.ssxzqh) = #{xzqhId}</if>
+            <if test="xzqhId != null and isBj == null"> and b.ssxzqh IN ( SELECT CODE FROM SYS_DEPT_JL WHERE FIND_IN_SET(#{xzqhId},ancestors) OR CODE = #{xzqhId} )</if>
+            <if test="xzqhId != null and isBj == 0"> and b.ssxzqh IN ( SELECT CODE FROM SYS_DEPT_JL WHERE FIND_IN_SET(#{xzqhId},ancestors) OR CODE = #{xzqhId} )</if>
+            <if test="xzqhId != null and isBj == 1"> and b.ssxzqh = #{xzqhId}</if>
             <if test="createUserType != null  and createUserType != ''"> and a.create_user_type = #{createUserType}</if>
         </where>
         ORDER BY a.create_time_str DESC
@@ -65,6 +97,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
 
+    <select id="selectYljgLrypByJgId" parameterType="String" resultMap="YljgLrypResult">
+        SELECT
+            IFNULL(b.jgmc,c.jgmc) as jgmc,
+            IFNULL(b.tyshxydm, c.tyshxydm) as tyshxydm,
+            getxzqhmcbycode(b.szxzqh) as szxzqh_name,
+            b.txdz,
+            a.*
+        FROM yljg_lryp a
+        LEFT JOIN yljg_jcxx b ON a.jg_id = b.id
+        where a.id = #{id}
+    </select>
+    <select id="selectYljgLrypBySqJgId" parameterType="String" resultMap="YljgLrypResult">
+        SELECT
+            b.jgmc,b.tyshxydm,
+            getxzqhmcbycode(b.szxzqh) as szxzqh_name,
+            b.txdz,
+            a.*
+        FROM yljg_lryp a
+        LEFT JOIN yljgsq_jcxx b ON a.jg_id = b.id
+        where a.id = #{id}
+    </select>
+
     <insert id="insertYljgLryp" parameterType="YljgLryp">
         insert into yljg_lryp
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-ui/src/views/business/lrxx/jbxxcx/index.vue

@@ -151,11 +151,11 @@
               </tr>
               <tr>
                 <td>户籍地址</td>
-                <td colspan="3">{{form.lrHjdzName + form.lrHjbcxx}}</td>
+                <td colspan="3">{{form.lrHjdzName}} {{form.lrHjbcxx == null?'':form.lrHjbcxx}} </td>
               </tr>
               <tr>
                 <td>现居地址</td>
-                <td colspan="3">{{form.lrXjdzName + form.lrXjdzBcxx}}</td>
+                <td colspan="3">{{form.lrXjdzName}} {{form.lrXjdzBcxx == null?'':form.lrXjdzBcxx}}</td>
               </tr>
             </table>
 

ruoyi-ui/src/views/business/lrxx/jbxxqr/index.vue

@@ -96,11 +96,13 @@
 							</tr>
 							<tr>
 								<td>户籍地址详细信息</td>
-								<td colspan="3">{{ form.lrHjdzName }} {{form.lrHjbcxx}}</td>
+<!--								<td colspan="3">{{ form.lrHjdzName }} {{form.lrHjbcxx}}</td>-->
+								<td colspan="3">{{ form.lrHjdzName }} {{form.lrHjbcxx == null?'':form.lrHjbcxx}}</td>
+
 							</tr>
 							<tr>
 								<td>居住地址详细信息</td>
-								<td colspan="3">{{ form.lrXjdzName }} {{form.lrXjdzBcxx}}</td>
+								<td colspan="3">{{ form.lrXjdzName }} {{form.lrXjdzBcxx == null?'':form.lrXjdzBcxx}}</td>
 							</tr>
 							<tr>
 								<td>户籍地址区划</td>

ruoyi-ui/src/views/business/lrxx/jbxxqrcx/index.vue

@@ -92,11 +92,11 @@
               </tr>
               <tr>
                 <td>户籍地址详细信息</td>
-	              <td colspan="3">{{ form.lrHjdzName }} {{form.lrHjbcxx}}</td>
+	              <td colspan="3">{{ form.lrHjdzName }} {{form.lrHjbcxx == null?'':form.lrHjbcxx}}</td>
               </tr>
               <tr>
                 <td>居住地址详细信息</td>
-	              <td colspan="3">{{ form.lrXjdzName }} {{form.lrXjdzBcxx}}</td>
+	              <td colspan="3">{{ form.lrXjdzName }} {{form.lrXjdzBcxx == null?'':form.lrXjdzBcxx}}</td>
               </tr>
               <tr v-if="form.lzztCx === '01'">
                 <td>户籍地址区划</td>

ruoyi-ui/src/views/organization/kugl/khjbxx/index.vue

@@ -1465,7 +1465,8 @@ export default {
       this.reset()
       const id = row.id || this.ids
       getKhjbxx(id).then(response => {
-        this.form = decryptData_ECB(response.data, ["xm", "zjhm", "xjd", "jhr", "gddh", "jhrsjhm", "sjhm", "cjzh"], [1, 2, 4, 1, 3, 3, 3, 2]);
+        // this.form = decryptData_ECB(response.data, ["xm", "zjhm", "xjd", "jhr", "gddh", "jhrsjhm", "sjhm", "cjzh"], [1, 2, 4, 1, 3, 3, 3, 2]);
+        this.form = decryptData_ECB(response.data, ["xm", "zjhm", "xjd", "gddh", "jhrsjhm", "sjhm", "cjzh"], [1, 2, 4, 3, 3, 3, 2]);
         this.form = response.data
         if (this.form.xzqhId) {
           this.form.xzqhId = JSON.stringify(this.form.xzqhId.split(','))
@@ -1739,7 +1740,8 @@ export default {
     particulars(row) {
       this.dataDetails = {}
       getKhjbxx(row.id).then(response => {
-        this.dataDetails = decryptData_ECB(response.data, ["xm", "zjhm", "xjd", "jhr", "gddh", "jhrsjhm", "sjhm", "cjzh"], [1, 2, 4, 1, 3, 3, 3, 2]);
+        // this.dataDetails = decryptData_ECB(response.data, ["xm", "zjhm", "xjd", "jhr", "gddh", "jhrsjhm", "sjhm", "cjzh"], [1, 2, 4, 1, 3, 3, 3, 2]);
+        this.dataDetails = decryptData_ECB(response.data, ["xm", "zjhm", "xjd", "gddh", "jhrsjhm", "sjhm", "cjzh"], [1, 2, 4, 3, 3, 3, 2]);
         this.openXQ = true
       })
       this.form.id = row.id

ruoyi-ui/src/views/organization/zwyw/babgsq/module/index.vue

@@ -278,7 +278,7 @@
                 </el-form-item>
                 <el-form-item label="证件类型" prop="barZjlx" class="formWidth">
                   <el-select v-model="form.barZjlx" placeholder="请选择法定代表人或负责人证件类型" @change="changeBarzjlx">
-                    <el-option v-for="dict in dict.type.XZ127" :key="dict.value" :label="dict.label"
+                    <el-option v-for="dict in dict.type.C0015" :key="dict.value" :label="dict.label"
                       :value="dict.value"></el-option>
                   </el-select>
                 </el-form-item>
@@ -304,7 +304,7 @@
                 <el-form-item label="申请人证件类型" prop="babgZjlx" class="formWidth">
                   <el-select v-model="form.babgZjlx" placeholder="请选择法定代表人或负责人证件类型"
                     @change="changeBabgZjlx(form.babgZjlx)">
-                    <el-option v-for="dict in dict.type.XZ127" :key="dict.value" :label="dict.label"
+                    <el-option v-for="dict in dict.type.C0015" :key="dict.value" :label="dict.label"
                       :value="dict.value"></el-option>
                   </el-select>
                 </el-form-item>
@@ -443,7 +443,7 @@ import { decryptData_ECB, decryptRowData_ECB, decrypt_ECB } from "@/api/tool/sm4
 
 export default {
   name: 'Module',
-  dicts: ['CH010', 'CZ035', 'XZ036', 'CH052', 'CZ005', 'CZ026', 'CZ004', 'C0038', 'C0015', 'CH012', 'CH007', 'CH009', 'XZ065', 'XZ070','XZ127'],
+  dicts: ['CH010', 'CZ035', 'XZ036', 'CH052', 'CZ005', 'CZ026', 'CZ004', 'C0038', 'C0015', 'CH012', 'CH007', 'CH009', 'XZ065', 'XZ070'],
   data() {
     return {
       decodeStr: {},
@@ -768,7 +768,7 @@ export default {
         title: '机构备案人信息', data: [
           [
             { type: 'text', data: '备案人姓名' }, { type: 'value', data: 'barXm' },
-            { type: 'text', data: '证件类型' }, { type: 'dict', data: 'barZjlx', dict: 'XZ127' },
+            { type: 'text', data: '证件类型' }, { type: 'dict', data: 'barZjlx', dict: 'C0015' },
             { type: 'text', data: '证件号码' }, { type: 'value', data: 'barZjhm' },
           ],
           [
@@ -781,12 +781,12 @@ export default {
         ]
       },
       bgList: {
-        title: '变更申请人信息', data: [
+        title: '变更申请人信息111', data: [
           [
             { type: 'text', data: '申请人姓名' },
             { type: 'value', data: 'babgXm' },
             { type: 'text', data: '申请人证件类型' },
-            { type: 'dict', data: 'babgZjlx', dict: 'XZ127' },
+            { type: 'dict', data: 'babgZjlx', dict: 'C0015' },
             { type: 'text', data: '申请人证件号码' },
             { type: 'value', data: 'babgSfzhm' },
           ],

ruoyi-ui/src/views/search/xxcx/fwjg/sqyljg/lryp/commonality/index.vue

@@ -123,8 +123,8 @@
             <td>{{form.tyshxydm}}</td>
           </tr>
           <tr>
-            <td>单位门牌号：</td>
-            <td colspan="3">{{form.szxzqhName}}</td>
+            <td>单位门牌号XXXXX：</td>
+            <td colspan="3">{{form.szxzqhName}} {{form.txdz}}</td>
           </tr>
 
         </table>
@@ -186,8 +186,8 @@
           <td>{{ dataDetails.tyshxydm }}</td>
         </tr>
         <tr>
-          <td>单位门牌号：</td>
-          <td colspan="3">{{ dataDetails.szxzqhName }}</td>
+          <td>单位门牌号1111：</td>
+          <td colspan="3">{{ dataDetails.szxzqhName }} {{dataDetails.txdz}}</td>
         </tr>
 
       </table>
@@ -228,7 +228,7 @@
 import { addLryp, delLryp, getLryp, listLryp, updateLryp } from "@/api/business/fwjggl/lryp";
 import { addLrypCx, delLrypCx, getLrypCx, listLrypCx, updateLrypCx } from "@/api/search/xxcx/lryp";
 import { mapState } from 'vuex'
-import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
+import { decryptData_ECB } from "@/api/tool/sm4";
 
 export default {
   name: "Lryp",
@@ -451,7 +451,8 @@ export default {
     },
     handleDetails(row) {
       this.request.getLryp(row.id).then(response => {
-        this.dataDetails = response.data
+        // this.dataDetails = response.data
+        this.dataDetails = decryptData_ECB(response.data,["txdz"],[4]);
         this.openXQ = true
       })
     },

ruoyi-ui/src/views/search/xxcx/lrxx/lrjbxx/index.vue

@@ -204,11 +204,11 @@
 							</tr>
 							<tr>
 								<td>户籍地址</td>
-								<td colspan="3">{{form.lrHjdzName + form.lrHjbcxx}}</td>
+								<td colspan="3">{{form.lrHjdzName}} {{form.lrHjbcxx == null?'':form.lrHjbcxx}}</td>
 							</tr>
 							<tr>
 								<td>现居地址</td>
-								<td colspan="3">{{form.lrXjdzName + form.lrXjdzBcxx}}</td>
+								<td colspan="3">{{form.lrXjdzName}} {{form.lrXjdzBcxx == null?'':form.lrXjdzBcxx}}</td>
 							</tr>
 						</table>
 						<h3>健康情况：</h3>

ruoyi-ui/src/views/search/xxcx/lrxx/rzjg/index.vue

@@ -964,7 +964,8 @@ export default {
     particulars(row) {
       this.dataDetails = {}
       getKhxxByJg(row.id).then((response) => {
-        this.dataDetails = decryptData_ECB(response.data, ["xm", "zjhm", "xjd", "sjhm", "gddh", "jhr", "jhrsjhm", "cjzh"], [1, 2, 4, 3, 3, 1, 2, 2]);
+        // this.dataDetails = decryptData_ECB(response.data, ["xm", "zjhm", "xjd", "sjhm", "gddh", "jhr", "jhrsjhm", "cjzh"], [1, 2, 4, 3, 3, 1, 2, 2]);
+        this.dataDetails = decryptData_ECB(response.data, ["xm", "zjhm", "xjd", "sjhm", "gddh", "jhrsjhm", "cjzh"], [1, 2, 4, 3, 3, 2, 2]);
         this.openXQ = true
       })
       this.form.id = row.id

ruoyi-ui/src/views/search/xxcx/lrxx/sqfw/index.vue

@@ -930,7 +930,8 @@ export default {
     particulars(row) {
       this.dataDetails = {};
       getKhxxByJg(row.id).then((response) => {
-        this.dataDetails = decryptData_ECB(response.data, ["xm", "zjhm", "xjd", "sjhm", "gddh", "jhr", "jhrsjhm", "cjzh"], [1, 2, 4, 3, 3, 1, 2, 2]);
+        // this.dataDetails = decryptData_ECB(response.data, ["xm", "zjhm", "xjd", "sjhm", "gddh", "jhr", "jhrsjhm", "cjzh"], [1, 2, 4, 3, 3, 1, 2, 2]);
+        this.dataDetails = decryptData_ECB(response.data, ["xm", "zjhm", "xjd", "sjhm", "gddh", "jhrsjhm", "cjzh"], [1, 2, 4, 3, 3, 2, 2]);
         this.openXQ = true;
       });
       this.form.id = row.id;