张涛 1 year ago
parent
commit
4082adb8c7

+ 1
- 0
src/main/java/com/example/civilizedcity/controller/WxMaController.java View File

162
         }
162
         }
163
 
163
 
164
         SysUser user = sysUserService.login(param);
164
         SysUser user = sysUserService.login(param);
165
+
165
         List<String> dutyList = sysUserDutyService.getListByUser(user.getUserId());
166
         List<String> dutyList = sysUserDutyService.getListByUser(user.getUserId());
166
         user.setDutyList(dutyList);
167
         user.setDutyList(dutyList);
167
 
168
 

+ 1
- 1
src/main/java/com/example/civilizedcity/service/impl/SysUserServiceImpl.java View File

59
         }
59
         }
60
 
60
 
61
         SysUser sysUser = getById(userId);
61
         SysUser sysUser = getById(userId);
62
-        if (Constants.STATUS_DELETE == sysUser.getStatus()) {
62
+        if (sysUser==null||Constants.STATUS_DELETE == sysUser.getStatus()) {
63
             throw new Exception("用户账户已删除");
63
             throw new Exception("用户账户已删除");
64
         }
64
         }
65
 
65
 

+ 1
- 0
src/main/resources/application-dev.yml View File

4
     url: jdbc:mysql://192.168.89.10:3306/civilizedcity?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
4
     url: jdbc:mysql://192.168.89.10:3306/civilizedcity?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
5
     username: civilizedcity
5
     username: civilizedcity
6
     password: civilizedcity@ABCD1234
6
     password: civilizedcity@ABCD1234
7
+    driver-class-name: com.mysql.cj.jdbc.Driver
7
     hikari:
8
     hikari:
8
       # 最小空闲连接数
9
       # 最小空闲连接数
9
       minimum-idle: 10
10
       minimum-idle: 10