Merge branch 'system-165' of uskycloud/usky-cloud into master

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/HceCategoryController.java

@@ -40,6 +40,17 @@ public class HceCategoryController {
         return ApiResult.success(hceCategoryService.page(hceCategoryVO));
     }
 
+    /**
+     * 帮助中心-栏目管理列表白名单
+     *
+     * @param hceCategoryVO
+     * @return
+     */
+    @PostMapping("pageWhite")
+    public ApiResult<List<HceCategoryListVO>> pageWhite(@RequestBody HceCategoryVO hceCategoryVO){
+        return ApiResult.success(hceCategoryService.pageWhite(hceCategoryVO));
+    }
+
     /**
      * 帮助中心-栏目管理新增
      * @param hceCategory

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysDeptController.java

@@ -84,7 +84,7 @@ public class SysDeptController extends BaseController {
     @GetMapping("/deptUserTreeSelect")
     public ApiResult treeselect(SysDept dept, SysUser user) {
         List<SysDept> depts = deptService.deptList(dept);
-        List<SysUser> users = iSysUserService.selectUserList(user);
+        List<SysUser> users = iSysUserService.selectDUserList(user);
         return ApiResult.success(deptService.buildDeptUserTreeSelect(depts, users));
     }
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/SysTenantConfig.java

@@ -149,4 +149,9 @@ public class SysTenantConfig implements Serializable {
      * 是否开启消息通知: 1、不开启 2、开启
      */
     private Integer messageStatus;
+
+    /**
+     * 中间页显示类型：0 应用列表 1 菜单列表
+     */
+    private Integer middleType;
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/HceCategoryService.java

@@ -20,6 +20,8 @@ public interface HceCategoryService extends CrudService<HceCategory> {
 
     List<HceCategoryListVO> page(HceCategoryVO hceCategoryVO);
 
+    List<HceCategoryListVO> pageWhite(HceCategoryVO hceCategoryVO);
+
     void add(HceCategory hceCategory);
 
     void update(HceCategory hceCategory);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysUserService.java

@@ -21,6 +21,14 @@ public interface ISysUserService extends CrudService<SysUser> {
      */
     public List<SysUser> selectUserList(SysUser user);
 
+    /**
+     * 根据条件分页查询用户列表
+     *
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    public List<SysUser> selectDUserList(SysUser user);
+
     /**
      * 根据条件分页查询已分配用户角色列表
      *

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/HceCategoryServiceImpl.java

@@ -70,6 +70,20 @@ public class HceCategoryServiceImpl extends AbstractCrudService<HceCategoryMappe
         return list1;
     }
 
+    @Override
+    public List<HceCategoryListVO> pageWhite(HceCategoryVO hceCategoryVO){
+        List<HceCategoryListVO> list = baseMapper.selectMenuTreeAll(hceCategoryVO.getCategoryName(),hceCategoryVO.getStartTime(),hceCategoryVO.getEndTime());
+
+        List<HceCategoryListVO> finalList = list;
+        List<HceCategoryListVO> list1 = list.stream().filter(s ->s.getParentId() == 0).map(
+                menu->{menu.setChildren(getChildrenData(menu, finalList));
+                    return menu;
+                }
+        ).collect(Collectors.toList());
+
+        return list1;
+    }
+
     private List<HceCategoryListVO> getChildrenData(HceCategoryListVO parent, List<HceCategoryListVO> all){
         List<HceCategoryListVO> children = all.stream().filter(k ->k.getParentId().equals(parent.getMenuId())).map(
                 menu->{

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysTenantPlatformServiceImpl.java

@@ -49,14 +49,17 @@ public class SysTenantPlatformServiceImpl extends AbstractCrudService<SysTenantP
     @Transactional
     public void updateTenantPlatform(TenantPlatformVo tenantPlatformVo) {
         Integer[] arr = tenantPlatformVo.getPlatformIds();
+        LambdaQueryWrapper<SysTenantPlatform> queryWrapper = Wrappers.lambdaQuery();
         if (tenantPlatformVo.getRequestId().equals(0)){
+            queryWrapper.eq(SysTenantPlatform::getTenantId,tenantPlatformVo.getTenantId())
+                    .eq(SysTenantPlatform::getIsDefault,1);
+            this.remove(queryWrapper);
             SysTenantPlatform sysTenantPlatform = new SysTenantPlatform();
             sysTenantPlatform.setTenantId(tenantPlatformVo.getTenantId());
             sysTenantPlatform.setPlatformId(arr[0]);
             sysTenantPlatform.setIsDefault(1);
             this.save(sysTenantPlatform);
         }else {
-            LambdaQueryWrapper<SysTenantPlatform> queryWrapper = Wrappers.lambdaQuery();
             queryWrapper.eq(SysTenantPlatform::getTenantId,tenantPlatformVo.getTenantId())
                     .ne(SysTenantPlatform::getIsDefault,1);
             this.remove(queryWrapper);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -74,6 +74,19 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         return userMapper.selectUserList(user);
     }
 
+    /**
+     * 根据条件分页查询用户列表
+     *
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    @Override
+    public List<SysUser> selectDUserList(SysUser user) {
+        user.setTenantId(SecurityUtils.getTenantId());
+        user.setUserType("00");
+        return userMapper.selectUserList(user);
+    }
+
     /**
      * 根据条件分页查询已分配用户角色列表
      *

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysTenantConfigMapper.xml

@@ -29,6 +29,7 @@
         <result column="cloud_type" property="cloudType"/>
         <result column="cloud_url" property="cloudUrl"/>
         <result column="message_status" property="messageStatus"/>
+        <result column="middle_type" property="middleType"/>
     </resultMap>
     <select id="getTenantConfig" resultType="com.usky.system.service.vo.SysTenantConfigVo">
         SELECT