计划bug处理

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

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

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnterpriseUserVo.java

@@ -66,7 +66,7 @@ public class EnterpriseUserVo implements Serializable {
      * 用户类型（sys_user系统用户）
      */
     @ExcelProperty(value = "用户类型", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "s=ys_user系统用户")
+    @ExcelDictFormat(readConverterExp = "00=enterprise_user企业用户")
     private String userType;
 
     /**

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

@@ -75,6 +75,15 @@ public interface IEnterpriseUserService {
 
     EnterpriseUserVo queryByLoginName(String loginName);
 
+    /**
+     * 根据登录名和用户类型查询企业用户
+     *
+     * @param loginName 登录名
+     * @param userType  用户类型
+     * @return 企业用户信息
+     */
+    EnterpriseUserVo queryByLoginNameAndUserType(String loginName, String userType);
+
     /**
      * 修改企业用户手机号码
      *

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

@@ -192,6 +192,14 @@ public class EnterpriseUserServiceImpl implements IEnterpriseUserService {
         return baseMapper.selectVoOne(lqw);
     }
 
+    @Override
+    public EnterpriseUserVo queryByLoginNameAndUserType(String loginName, String userType) {
+        LambdaQueryWrapper<EnterpriseUser> lqw = Wrappers.lambdaQuery();
+        lqw.eq(EnterpriseUser::getLoginName, loginName);
+        lqw.eq(EnterpriseUser::getUserType, userType);
+        return baseMapper.selectVoOne(lqw);
+    }
+
     /**
      * 修改企业用户手机号码
      *

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

@@ -21,7 +21,7 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://127.0.0.1:3309/efcode-v2-4?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          url: jdbc:mysql://127.0.0.1:3309/efcode-v2-5?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
           username: root
           password: root