填充数据域时因为用户不存在导致的报错

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java

@@ -257,7 +257,11 @@ public class AppEnforcementRegistrationController extends BaseController
             enforcementRegistration.setLawEnforcer(userBean.getUserName() +" - "+ lawCN);
 
             // 执法人员2需要展示用户名+执法码
-            List<UserBean> userBeans = userApi.getUserByUserIds(enforcementRegistration.getLawEnforcerIdTwo());
+//            List<UserBean> userBeans = userApi.getUserByUserIds(enforcementRegistration.getLawEnforcerIdTwo());
+            List<UserBean> userBeans = new ArrayList<>();
+            if (StringUtils.isNotEmpty(enforcementRegistration.getLawEnforcerIdTwo())) {
+                userBeans = userApi.getUserByUserIds(enforcementRegistration.getLawEnforcerIdTwo());
+            }
             String tmpUserShow = "";
             for (UserBean ub : userBeans) {
                 String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum();
@@ -330,7 +334,11 @@ public class AppEnforcementRegistrationController extends BaseController
         UserBean userBean = userApi.getUserByUserId(userId);
         EnforcementRegistration registration = enforcementRegistrationService.getByDeptIdAndEnterpriseNumber(userBean.getDeptId(), enterpriseInformation.getEnterpriseNumber());
         // 执法人员需要展示用户名+执法码
-        List<UserBean> userBeans = userApi.getUserByUserIds(registration.getLawEnforcerIdTwo());
+//        List<UserBean> userBeans = userApi.getUserByUserIds(registration.getLawEnforcerIdTwo());
+        List<UserBean> userBeans = new ArrayList<>();
+        if (StringUtils.isNotEmpty(registration.getLawEnforcerIdTwo())) {
+            userBeans = userApi.getUserByUserIds(registration.getLawEnforcerIdTwo());
+        }
         String tmpUserShow = "";
         for (UserBean ub : userBeans) {
             String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum();

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java

@@ -347,7 +347,10 @@ public class AppEnterpriseLawEnforcementController extends BaseController
         enfrorcement.setDeptObjs(objs);
 
         // 执法人员需要展示用户名+执法码
-        List<UserBean> userBeans = userApi.getUserByUserIds(enfrorcement.getLawEnforcerTwoId());
+        List<UserBean> userBeans = new ArrayList<>();
+        if (StringUtils.isNotEmpty(enfrorcement.getLawEnforcerTwoId())) {
+            userBeans = userApi.getUserByUserIds(enfrorcement.getLawEnforcerTwoId());
+        }
         String tmpUserShow = "";
         for (UserBean ub : userBeans) {
             String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum();

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java

@@ -126,6 +126,13 @@ public class AppSystemController extends BaseController {
         return ZDResponse.success("查询成功",list);
     }
 
+    @GetMapping("/listUsersNoPermission")
+    @ResponseBody
+    public ZDResponse listUsersNoPermission(User user) {
+        List<User> list = userService.selectUserListNoPermission(user);
+        return ZDResponse.success("查询成功",list);
+    }
+
     //    @RequiresPermissions("system:user:list")
     @GetMapping("/listDeptApp")
     @ResponseBody

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/IUserService.java

@@ -43,6 +43,13 @@ public interface IUserService
      */
     public List<User> selectUserList(User user);
 
+    /**
+     * 无权限查询用户列表
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    public List<User> selectUserListNoPermission(User user);
+
     /**
      * 根据条件分页查询已分配用户角色列表
      * 

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java

@@ -123,6 +123,16 @@ public class UserServiceImpl implements IUserService {
         return userMapper.selectUserList(user);
     }
 
+    /**
+     * 无权限查询用户列表
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    @Override
+    public List<User> selectUserListNoPermission(User user) {
+        return userMapper.selectUserListByDeptId(user);
+    }
+
 
 
 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java

@@ -70,23 +70,19 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
     @Override
     public EnforcementRegistration selectEnforcementRegistrationById(String id)
     {
-        EnforcementRegistration enforcementRegistration =
+        EnforcementRegistration enforcementRegistration = enforcementRegistrationMapper.selectEnforcementRegistrationById(id);
-                enforcementRegistrationMapper.selectEnforcementRegistrationById(id);
         if(enforcementRegistration.getLawEnforcerId() != null){
-            UserBean user =
+//            UserBean user = userApi.getUserByUserId(enforcementRegistration.getLawEnforcerId());
-                    userApi.getUserByUserId(enforcementRegistration.getLawEnforcerId());
 //            enforcementRegistration.setLawEnforcer(enforcementRegistration.getLawEnforcer() + " " + user.getLawCertificateNum() );
             enforcementRegistration.setLawEnforcer(enforcementRegistration.getLawEnforcer());
         }
         if(enforcementRegistration.getLawEnforcerIdTwo() != null){
-            List<UserBean> users =
+//            List<UserBean> users = userApi.getUserByUserIds(enforcementRegistration.getLawEnforcerIdTwo());
-                    userApi.getUserByUserIds(enforcementRegistration.getLawEnforcerIdTwo());
 //            enforcementRegistration.setLawEnforcerTwo(enforcementRegistration.getLawEnforcerTwo() + " " + user.getLawCertificateNum() );
             enforcementRegistration.setLawEnforcerTwo(enforcementRegistration.getLawEnforcerTwo());
         }
         if(enforcementRegistration.getSubsidiaryerId() != null){
-            UserBean user =
+//            UserBean user = userApi.getUserByUserId(enforcementRegistration.getSubsidiaryerId());
-                    userApi.getUserByUserId(enforcementRegistration.getSubsidiaryerId());
 //            enforcementRegistration.setSubsidiaryer(enforcementRegistration.getSubsidiaryer() + " " + user.getLawCertificateNum() );
             enforcementRegistration.setSubsidiaryer(enforcementRegistration.getSubsidiaryer());
         }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zdxt.code.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import cn.hutool.core.convert.Convert;