Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/resources/application-prod.yml

@@ -61,7 +61,7 @@ spring:
             # 主库数据源
             master:
                 url: jdbc:mysql://127.0.0.1:3306/zhaoshang2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: zhaoshang
+                username: root
                 password: zhaoshang@2018
             # 从库数据源
             slave:

ruoyi-system/src/main/java/com/ruoyi/system/mapper/projectV2/ZsyzSbbzbMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.mapper.projectV2;
 
+import com.ruoyi.system.domain.projectV2.ZsyzLdps;
 import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
 
 import java.util.List;
@@ -86,7 +87,7 @@ public interface ZsyzSbbzbMapper
     List<ZsyzSbbzb> ldpsList(ZsyzSbbzb zsyzSbbzb);
 
 
-    long ldpsListCount(ZsyzSbbzb zsyzSbbzb);
+    long ldpsListCount(ZsyzSbbzb zsyzSbb);
 
     long selectZsyzSbbzbListCount(ZsyzSbbzb zsyzSbbzb);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/projectV2/common/ZsyzCommonServiceImpL.java

@@ -228,7 +228,9 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             }
             map.put("wt", wt);
             //统计批示项目数量
-            long ps = zsyzSbbzbMapper.ldpsListCount(new ZsyzSbbzb());
+            ZsyzSbbzb zsyzSbb = new ZsyzSbbzb();
+            zsyzSbbzb.setDeptId(deptId);
+            long ps = zsyzSbbzbMapper.ldpsListCount(zsyzSbb);
             map.put("ps", ps);
             map.put("all", all);
             redisCache.setCacheObject(INDEX+deptId, map, 1, TimeUnit.HOURS);