Merge branch 'dsc' into 'develop'

Dsc

See merge request 8timerv2/8timerapiv200!230

src/main/java/cn/timer/api/controller/zcgl/ZcglController.java

@@ -308,8 +308,10 @@ public class ZcglController {
 				zcglQueryDto.getTotalPage() == null ? 10 : zcglQueryDto.getTotalPage());
 				zcglQueryDto.getTotalPage() == null ? 10 : zcglQueryDto.getTotalPage());
 
 
 		QueryWrapper<ZcglAdminZccrkgl> queryWrapper = new QueryWrapper<>();
 		QueryWrapper<ZcglAdminZccrkgl> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("status", 0).between(!StrUtil.hasBlank(s) && !StrUtil.hasBlank(e), "grsj_time",
-				!StrUtil.hasBlank(s) ? s : "1000-01-01 00:00:00", !StrUtil.hasBlank(e) ? e : "9999-01-01 00:00:00")
+		queryWrapper.eq("org_code", userBean.getOrgCode()).eq("status", 0)
+				.between(!StrUtil.hasBlank(s) && !StrUtil.hasBlank(e), "grsj_time",
+						!StrUtil.hasBlank(s) ? s : "1000-01-01 00:00:00",
+						!StrUtil.hasBlank(e) ? e : "9999-01-01 00:00:00")
 				.and(!StrUtil.hasBlank(q),
 				.and(!StrUtil.hasBlank(q),
 						wq -> wq.like("zcmc", q).or().like("zcggxh", q).or().like("zcgys", q).or().like("zcbh", q));
 						wq -> wq.like("zcmc", q).or().like("zcggxh", q).or().like("zcgys", q).or().like("zcbh", q));
 
 
@@ -336,8 +338,10 @@ public class ZcglController {
 				zcglQueryDto.getTotalPage() == null ? 10 : zcglQueryDto.getTotalPage());
 				zcglQueryDto.getTotalPage() == null ? 10 : zcglQueryDto.getTotalPage());
 
 
 		QueryWrapper<ZcglAdminZccrkgl> queryWrapper = new QueryWrapper<>();
 		QueryWrapper<ZcglAdminZccrkgl> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("status", 1).between(!StrUtil.hasBlank(s) && !StrUtil.hasBlank(e), "grsj_time",
-				!StrUtil.hasBlank(s) ? s : "1000-01-01 00:00:00", !StrUtil.hasBlank(e) ? e : "9999-01-01 00:00:00")
+		queryWrapper.eq("org_code", userBean.getOrgCode()).eq("status", 1)
+				.between(!StrUtil.hasBlank(s) && !StrUtil.hasBlank(e), "grsj_time",
+						!StrUtil.hasBlank(s) ? s : "1000-01-01 00:00:00",
+						!StrUtil.hasBlank(e) ? e : "9999-01-01 00:00:00")
 				.and(!StrUtil.hasBlank(q),
 				.and(!StrUtil.hasBlank(q),
 						wq -> wq.like("zcmc", q).or().like("zcggxh", q).or().like("zcgys", q).or().like("zcbh", q));
 						wq -> wq.like("zcmc", q).or().like("zcggxh", q).or().like("zcgys", q).or().like("zcbh", q));
 
 

src/main/resources/application-dev.yml

@@ -176,7 +176,7 @@ config-8timer:
   register-company-max-num: 100 #默认最大公司数量
   register-company-max-num: 100 #默认最大公司数量
   register-childAccount-max-num: 10 #默认最大子账号数量
   register-childAccount-max-num: 10 #默认最大子账号数量
   Aliyun:    # 阿里云
   Aliyun:    # 阿里云
-    PROJECT_NAME: 8小时人事管家
+    PROJECT_NAME: 8小时协同办公#8小时人事管家
     REGION_ID: cn-shenzhen
     REGION_ID: cn-shenzhen
     ACCESSKEY_ID: LTAI4FuaShJWQ1dggsFWG5CC
     ACCESSKEY_ID: LTAI4FuaShJWQ1dggsFWG5CC
     SECRET: EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR
     SECRET: EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR

src/main/resources/application-pro.yml

@@ -151,7 +151,7 @@ config-8timer:
   register-company-max-num: 100
   register-company-max-num: 100
   register-childAccount-max-num: 10
   register-childAccount-max-num: 10
   Aliyun:    # 阿里云
   Aliyun:    # 阿里云
-    PROJECT_NAME: 8小时人事管家
+    PROJECT_NAME: 8小时协同办公#8小时人事管家
     REGION_ID: cn-shenzhen
     REGION_ID: cn-shenzhen
     ACCESSKEY_ID: LTAI4FuaShJWQ1dggsFWG5CC
     ACCESSKEY_ID: LTAI4FuaShJWQ1dggsFWG5CC
     SECRET: EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR
     SECRET: EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR

src/main/resources/application-test.yml

@@ -150,7 +150,7 @@ config-8timer:
   register-company-max-num: 100
   register-company-max-num: 100
   register-childAccount-max-num: 10
   register-childAccount-max-num: 10
   Aliyun:    # 阿里云
   Aliyun:    # 阿里云
-    PROJECT_NAME: 8小时人事管家
+    PROJECT_NAME: 8小时协同办公#8小时人事管家
     REGION_ID: cn-shenzhen
     REGION_ID: cn-shenzhen
     ACCESSKEY_ID: LTAI4FuaShJWQ1dggsFWG5CC
     ACCESSKEY_ID: LTAI4FuaShJWQ1dggsFWG5CC
     SECRET: EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR
     SECRET: EJ6qToT4T4u0B5Rb6qrta9WkyGHvGR