From 7dc9e1cca58f183cdfbafa5c433f23ae0d16efd7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 04 十二月 2023 17:46:54 +0800
Subject: [PATCH] 平台端调度部门下拉框回滚版本

---
 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java |   19 +++----------------
 ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java           |    2 +-
 ycl-platform/src/main/resources/application-prod.yml                        |    8 ++++----
 ycl-platform/src/main/resources/logback-spring.xml                          |    4 +---
 ycl-platform/src/main/java/com/ycl/PlatformApplication.java                 |    1 -
 5 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index e151ebd..b2daa9f 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -587,23 +587,10 @@
 
     @Override
     public List<UmsAdmin> getDepartUser(Long departId) {
-        //TODO锛氭煡璇簩绾ч儴闂ㄥ強鎵�鏈夊瓙绾ч儴闂�
-        List<UmsDepart> umsDeparts = umsDepartManageMapper.selectChildrendIds(departId);
-        List<Long> parentIds = umsDeparts.stream().map(UmsDepart::getParentId).collect(Collectors.toList());
-        List<Long> ids = umsDeparts.stream().map(UmsDepart::getId).collect(Collectors.toList());
-        List<Long> departIds = new ArrayList<>();
-        for (Long id : ids) {
-            if(!parentIds.contains(id)){
-                departIds.add(id);
-            }
-        }
-
         QueryWrapper<UmsDepartManage> wrapper = new QueryWrapper<>();
-        wrapper.lambda().in(UmsDepartManage::getDepartId, departIds);
-        List<UmsDepartManage> users = umsDepartManageMapper.selectList(wrapper);
-
-        List<Long> userIds = users.stream().map(UmsDepartManage::getUserId).collect(Collectors.toList());
-
+        wrapper.lambda().eq(UmsDepartManage::getDepartId, departId);
+        List<UmsDepartManage> list = umsDepartManageMapper.selectList(wrapper);
+        List<Long> userIds = list.stream().map(UmsDepartManage::getUserId).collect(Collectors.toList());
         QueryWrapper<UmsAdmin> wrapperUser = new QueryWrapper<>();
         wrapperUser.in("id", userIds);
         List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
diff --git a/ycl-platform/src/main/java/com/ycl/PlatformApplication.java b/ycl-platform/src/main/java/com/ycl/PlatformApplication.java
index c59d124..b68325a 100644
--- a/ycl-platform/src/main/java/com/ycl/PlatformApplication.java
+++ b/ycl-platform/src/main/java/com/ycl/PlatformApplication.java
@@ -43,5 +43,4 @@
 
 
     }
-
 }
diff --git a/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java b/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java
index cfbd562..941f271 100644
--- a/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java
+++ b/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java
@@ -72,7 +72,7 @@
     @Autowired
     private UmsAdminRoleRelationService umsAdminRoleRelationService;
 
-    //@Scheduled(cron = "0 50 14 * * ?")
+    //@Scheduled(cron = "0 0 00 * * ?")
     @Transactional(rollbackFor = Exception.class)
     public void run() {
         log.info("寮�濮嬪悓姝ヤ换鍔�");
diff --git a/ycl-platform/src/main/resources/application-prod.yml b/ycl-platform/src/main/resources/application-prod.yml
index d4060ba..ce662ad 100644
--- a/ycl-platform/src/main/resources/application-prod.yml
+++ b/ycl-platform/src/main/resources/application-prod.yml
@@ -89,8 +89,8 @@
 
 #涓撴湁閽夐拤鍙傛暟
 zzding :
-  app-key : SC_ZHZF-IC5g2YiRDW8tug1DfAfiui
-  app-secret : 39RIHFOKd8fUeeW9T7CdBcwEqA6dMKx5d3686B6P
-  domain-name : openplatform.dg-work.cn
+  app-key : sczhzfpt-81R3ErbU00G4VoXaEBruq
+  app-secret : 0GPY3aQDL3l38J7p6K37DV6BCXIOLzrynU71Br36
+  domain-name : openplatform-pro.ding.zj.gov.cn
   protocal : https
-  tenant-id : 50645661
\ No newline at end of file
+  tenant-id : 196729
\ No newline at end of file
diff --git a/ycl-platform/src/main/resources/logback-spring.xml b/ycl-platform/src/main/resources/logback-spring.xml
index 4331451..b1c2d12 100644
--- a/ycl-platform/src/main/resources/logback-spring.xml
+++ b/ycl-platform/src/main/resources/logback-spring.xml
@@ -108,7 +108,7 @@
 		</root>
 	</springProfile>
 
-	<springProfile name="pro">
+	<springProfile name="prod">
 		<!--鎵撳嵃SQL-->
 		<logger name="java.sql.Connection" level="ERROR" />
 		<logger name="java.sql.Statement" level="ERROR" />
@@ -121,8 +121,6 @@
 			<appender-ref ref="Console" />
 		</root>
 	</springProfile>
-
-
 
 
 </configuration>
\ No newline at end of file

--
Gitblit v1.8.0