From e898aba6f4b28a3808d44332b982c21863a8d8cf Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Tue, 26 May 2026 16:35:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E6=B4=BB=E6=9F=A5=E8=AF=A2=E6=98=8E=E7=BB=86=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E7=A9=BA=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...pNonEnforcementRegistrationController.java |  1 +
 ...NonEnforcementRegistrationServiceImpl.java | 32 ++++++++++++-------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppNonEnforcementRegistrationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppNonEnforcementRegistrationController.java
index 636387a7..a2ced8b4 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppNonEnforcementRegistrationController.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppNonEnforcementRegistrationController.java
@@ -46,6 +46,7 @@ public class AppNonEnforcementRegistrationController extends BaseController {
     /**
      * 执法端-非行政查询执法登记列表
      */
+    @SaIgnore
     @GetMapping("/queryById")
     public  R<NonEnforcementRegistrationVo>  queryById(String id)
     {
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/NonEnforcementRegistrationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/NonEnforcementRegistrationServiceImpl.java
index 617b31c9..29ab6ed7 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/NonEnforcementRegistrationServiceImpl.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/NonEnforcementRegistrationServiceImpl.java
@@ -63,25 +63,33 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg
     {
         NonEnforcementRegistrationVo nonReg = nonEnforcementRegistrationMapper.selectVoById(id);
         if (nonReg != null && nonReg.getId() != null) {
-            SysUserVo user = sysUserMapper.selectUserById(Long.valueOf(nonReg.getLawEnforcerId()));
-            String temp=user.getLawCertificateNum();
-            if(StringUtils.isEmpty(temp)){
-                temp= CommonUtil.encryptPhone(user.getPhonenumber());
+            // 处理主执法人员信息
+            if (StringUtils.isNotEmpty(nonReg.getLawEnforcerId())) {
+                SysUserVo user = sysUserMapper.selectUserById(Long.valueOf(nonReg.getLawEnforcerId()));
+                if (user != null) {
+                    String temp = user.getLawCertificateNum();
+                    if (StringUtils.isEmpty(temp)) {
+                        temp = CommonUtil.encryptPhone(user.getPhonenumber());
+                    }
+                    nonReg.setLawEnforcer(user.getUserName() + " " + temp);
+                }
             }
-            nonReg.setLawEnforcer(user.getUserName()+" "+temp);
+
             if(StringUtils.isNotEmpty(nonReg.getLawEnforcerOther())){
                 List<SysUserVo> list = sysUserMapper.selectUserByIds(Convert.toStrArray(nonReg.getLawEnforcerIdOther()));
-                if(list.size()!=0){
+                if(list != null && list.size() != 0){
                     String tmpUserShow = "";
                     for (SysUserVo ub : list) {
-                        String t = ub.getLawCertificateNum();
-                        if(StringUtils.isEmpty(t)){
-                            t=CommonUtil.encryptPhone(ub.getPhonenumber());
+                        if (ub != null) {
+                            String t = ub.getLawCertificateNum();
+                            if(StringUtils.isEmpty(t)){
+                                t = CommonUtil.encryptPhone(ub.getPhonenumber());
+                            }
+                            tmpUserShow += ub.getUserName() + " " + t + ",";
                         }
-                        tmpUserShow += ub.getUserName() +" "+ t + ",";
                     }
                     if (tmpUserShow.length() > 0) {
-                        tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1);
+                        tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length() - 1);
                     }
                     nonReg.setLawEnforcerOther(tmpUserShow);
                 }
@@ -89,7 +97,7 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg
 
             LambdaQueryWrapper<ZdxtFile> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(ZdxtFile::getBusinessId, nonReg.getId());
-            List<ZdxtFile> zdxtFileCommons=zdxtFileMapper.selectList(queryWrapper);
+            List<ZdxtFile> zdxtFileCommons = zdxtFileMapper.selectList(queryWrapper);
             if (zdxtFileCommons.size() > 0) {
                 Map<String, Object> params = new HashMap<String, Object>();
                 params.put("fileList", zdxtFileCommons);