平台端调度部门下拉框回滚版本

fuliqi

2023-12-04 7dc9e1cca58f183cdfbafa5c433f23ae0d16efd7

平台端调度部门下拉框回滚版本

 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);

 ycl-platform/src/main/java/com/ycl/PlatformApplication.java

@@ -43,5 +43,4 @@


    }

}

 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("开始同步任务");

 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
  tenant-id : 196729

 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>