Merge remote-tracking branch 'origin/dev' into dev

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java

@@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zdxt.enforcementcode.common.annotation.DataScope;
 import com.zdxt.enforcementcode.common.commonenum.PlatformTypeEnums;
+import com.zdxt.enforcementcode.common.util.IdCardCryptoUtil;
 import com.zdxt.enforcementcode.domain.*;
 import com.zdxt.enforcementcode.domain.bo.DashboardEnterpriseCheckQueryBo;
 import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo;
@@ -73,7 +74,24 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
      */
     @Override
     public EnforcementRegistrationVo queryById(String id){
-        return baseMapper.selectVoById(id);
+        EnforcementRegistrationVo vo=  baseMapper.selectVoById(id);
+
+        // 手机号码中间四位星号代替
+        if (StringUtils.isNotBlank(vo.getLawEnforcerId())) {
+            String lawEnforcerId = vo.getLawEnforcerId();
+            if (lawEnforcerId.length() >= 7) {
+                vo.setLawEnforcerId(lawEnforcerId.substring(0, 3) + "****" + lawEnforcerId.substring(lawEnforcerId.length() - 4));
+            }
+        }
+
+        if (StringUtils.isNotBlank(vo.getLawEnforcerIdTwo())) {
+            String lawEnforcerIdTwo = vo.getLawEnforcerIdTwo();
+            if (lawEnforcerIdTwo.length() >= 7) {
+                vo.setLawEnforcerIdTwo(lawEnforcerIdTwo.substring(0, 3) + "****" + lawEnforcerIdTwo.substring(lawEnforcerIdTwo.length() - 4));
+            }
+        }
+
+        return vo;
     }
 
     /**

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SysNoticeInfoServiceImpl.java

@@ -211,14 +211,14 @@ public class SysNoticeInfoServiceImpl implements ISysNoticeInfoService {
         update.setUpdateBy(LoginHelper.getUserId()!= null ? LoginHelper.getUserId() : null);
         update.setUpdateByName(LoginHelper.getUsername()!= null ? LoginHelper.getUsername() : null);
         // 状态为null 表示编辑直接修改
-        Long status = update.getStatus();
+        /*Long status = update.getStatus();
         if (status !=null){
             if (status==2){
                 update.setIsDelete(0L);
             } else if (status==3){
                 update.setIsDelete(1L);
             }
-        }
+        }*/
 
         return baseMapper.updateById(update)> 0;
     }

zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue

@@ -210,8 +210,10 @@ const onFileSelected = async (event) => {
 
 const openWxScan = () => {
         let fullUrl = window.location.href;
-        let code = fullUrl.substring(fullUrl.indexOf('code=') + 5, fullUrl.indexOf('&state='));
+        // let code = fullUrl.substring(fullUrl.indexOf('code=') + 5, fullUrl.indexOf('&state='));
-        let paramUrl = window.location.href.split("#")[0];
+        let code = "http";
+        // let paramUrl = window.location.href.split("#")[0];
+        let paramUrl = "http://jdm.szssfj.cn/enforce/scanQrCode";
         let param = {code: code, url: paramUrl};
         szyptGetToken(param, success => {
             let resMsg = success.data;