Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

Merge branch 'zigonggao_dev' into huacheng_test

 flower_city/src/main/java/com/dg/core/api/GuideDoAppletsController.java

@@ -49,8 +49,8 @@
     */
    @ApiOperation(value = " 查询导办用户列表（不分页）",response = SysUser.class)
    @GetMapping("/queryList")
    public  ResultData  queryList(){
        return  ResultData.success(IUserService.queryList(2));
    public  ResultData  queryList(@RequestParam(value = "keyWord",required = false) String keyWord){
        return  ResultData.success(IUserService.queryList(2,keyWord));
    }

}

 flower_city/src/main/java/com/dg/core/controller/GuideDoController.java

@@ -219,8 +219,7 @@
    @ApiOperation(" 查询导办用户列表（不分页）")
    @GetMapping("/queryList")
    @Authorization
    public  ResultData  queryList(){
        return  ResultData.success(IUserService.queryList(2));
    public  ResultData  queryList(@RequestParam(value = "keyWord",required = false) String keyWord){
        return  ResultData.success(IUserService.queryList(2,keyWord));
    }

}

 flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java

@@ -80,5 +80,5 @@
     * @param userType 用户类型
     * @return 结果
     */
    List<SysUser>  queryList(@Param("userType") Integer userType);
    List<SysUser>  queryList(@Param("userType") Integer userType,String keyWord);
}

 flower_city/src/main/java/com/dg/core/service/ISysUserService.java

@@ -84,7 +84,7 @@
     * @param userType 用户类型
     * @return 结果
     */
    List<SysUser> queryList(Integer userType);
    List<SysUser> queryList(Integer userType,String keyWor);


}

 flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java

@@ -223,8 +223,8 @@
    }

    @Override
    public List<SysUser> queryList(Integer userType) {
        return baseMapper.queryList(userType);
    public List<SysUser> queryList(Integer userType,String keyWord) {
        return baseMapper.queryList(userType,keyWord);
    }

    public  List<String> getDepartmentIds(  List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){