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

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

@@ -130,7 +130,7 @@ public class AppEnfLoginController extends LoginController {
         data.put("loginName", user.getLoginName());
         data.put("nickName", user.getNickName());
         data.put("phonenumber", phonenumber != null ? phonenumber : "");
-        data.put("lawCertificateNum", user.getNickName());
+        data.put("lawCertificateNum", user.getLawCertificateNum());
         data.put("deptId", user.getDeptId());
         data.put("deptName", sysDept.getDeptName());
 
@@ -222,7 +222,7 @@ public class AppEnfLoginController extends LoginController {
             data.put("loginName", user.getLoginName());
             data.put("nickName", user.getNickName());
             data.put("phonenumber", phonenumber != null ? phonenumber : "");
-            data.put("lawCertificateNum", user.getNickName());
+            data.put("lawCertificateNum", user.getLawCertificateNum());
             data.put("deptId", user.getDeptId());
             data.put("deptName", sysDept.getDeptName());
 

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

@@ -47,7 +47,7 @@ public class AppEntLoginController extends LoginController {
         }
 
         // 2. 根据登录名和用户类型查询用户
-        EnterpriseUserVo user = enterpriseUserService.queryByLoginNameAndUserType(secretName, "00");
+        EnterpriseUserVo user = enterpriseUserService.queryByLoginNameAndUserType(secretName, "app_user");
         if (user == null) {
             return R.fail("用户不存在");
         }

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

@@ -196,7 +196,7 @@ public class EnterpriseUserServiceImpl implements IEnterpriseUserService {
     public EnterpriseUserVo queryByLoginNameAndUserType(String loginName, String userType) {
         LambdaQueryWrapper<EnterpriseUser> lqw = Wrappers.lambdaQuery();
         lqw.eq(EnterpriseUser::getLoginName, loginName);
-        lqw.eq(EnterpriseUser::getUserType, userType);
+//        lqw.eq(EnterpriseUser::getUserType, userType);
         return baseMapper.selectVoOne(lqw);
     }