diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java index a337d5f..f553447 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java @@ -80,7 +80,7 @@ public class SysUsernumController extends BaseController { List sysDepts = deptService.selectDeptList(dept); for (SysDept sysDept : sysDepts) { for (SysUser user1 : list) { - if (sysDept.getDeptName().equals(user1.getDept().getDeptName())) { + if (sysDept.getDeptId().equals(user1.getDept().getDeptId())) { sysuser.add(user1); } } diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index c88f566..479e158 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -8,11 +8,11 @@ spring: # 主库数据源 master: #url: jdbc:postgresql://192.168.254.176:5432/work-portal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - url: jdbc:highgo://127.0.0.1:5866/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - #username: postgres highgo - #password: Qwer@1234 Qwer@1234 - username: ENC(JLAHIbU3w8J5iJ1Uye0G3A==) - password: ENC(SRDnQl+5Iv2SC4UzwhSeILfFUUmY4pka) + url: jdbc:highgo://192.168.254.195:5866/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + #username: highgo sysdba + #password: Qwer@1234 Hello@1234 + username: ENC(qgUzNagVYIQs/h1PUI+5Gg==) + password: ENC(liYH7bJJn+q1GIjQLKjqspMy3uD9Oiu4) # 从库数据源 slave: # 从数据源开关/默认关闭