优化执法端登录系统

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/config/SzyptConfig.java

@@ -75,7 +75,7 @@ public class SzyptConfig {
         private boolean enabled = false;
 
         /** 模拟用户 ID (对应 sys_user 表的 login_name) */
-        private String mockUserId = "test_zhangsan";
+        private String mockUserId = "kangxiaoyuan";
 
         public boolean isEnabled() {
             return enabled;

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/DataFilterUtil.java

@@ -425,8 +425,10 @@ public class DataFilterUtil {
         if (CollUtil.isEmpty(users)) {
             return null;
         }
-        SysDeptVo userSysDept = new SysDeptVo();
+        ISysDeptService sysDeptService = SpringUtils.getBean(ISysDeptService.class);
-        userSysDept.setDeptId(String.valueOf(users.get(0).getDeptId()));
+        SysDeptVo userSysDept = sysDeptService.selectDeptById(users.get(0).getDeptId());
+//        SysDeptVo userSysDept = new SysDeptVo();
+//        userSysDept.setDeptId(String.valueOf(users.get(0).getDeptId()));
         return userSysDept;
     }
 

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfLoginController.java

@@ -128,7 +128,7 @@ public class AppEnfLoginController extends LoginController {
      */
     @GetMapping("/szyptLogin")
     @ResponseBody
-    public R<Map<String, Object>> szyptLogin(@PathVariable String code){
+    public R<Map<String, Object>> szyptLogin(@RequestParam("code")  String code){
         return appEnfLoginService.szyptLogin(code);
     }
 }

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

@@ -94,6 +94,9 @@ public class AppEnfLoginServiceImpl implements IAppEnfLoginService {
 
         // 3. 查询系统用户
         SysUserVo sysUser = getSysUserByLoginName(userId);
+        if (sysUser == null) {
+            return R.fail("用户不存在");
+        }
 
         // 4. 判断是否执法人员
         if (StringUtils.isNotEmpty(sysUser.getLawCertificateNum())) {
@@ -111,6 +114,11 @@ public class AppEnfLoginServiceImpl implements IAppEnfLoginService {
         SrzDeptVo srzOrgan = DataFilterUtil.getUserOrganDept(sysUser.getUserId());
         SysDeptVo sysDept = DataFilterUtil.getUserSysDept(sysUser.getUserId());
         SysDeptVo bureauDept = DataFilterUtil.getUserBureauDept(sysUser.getUserId());
+
+        if (sysDept == null) {
+            return R.fail("该用户未关联部门，无法登录执法端");
+        }
+
         // 如果没有执法证件号, 则再次判断是否为公安
         if (!sysUser.getLawOfficer()) {
         if(bureauDept != null){//获取执法部门ID

zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml

@@ -322,7 +322,7 @@ szypt:
   mock:
     enabled: true
     # 模拟用户登录名 (对应 sys_user 表的 login_name)
-    mock-user-id: test_zhangsan
+    mock-user-id: kangxiaoyuan
 
 #市认证网关
 srnwg: