Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

yanghui

2022-12-08 5e7892cd0921111dfbaf84196f2593f8045d1c11

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

@@ -29,7 +29,8 @@
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,
                                          @Param("userType") String userType,
                                          @Param("userName") String userName,
                                          @Param("ids") List<String> ids);
                                          @Param("ids") List<String> ids,
                                          @Param("isDivisionHead") String  isDivisionHead);



@@ -70,7 +71,8 @@
     */
    public int selectNum(@Param("userType") String userType,
                         @Param("userName") String userName,
                         @Param("ids") List<String> ids);
                         @Param("ids") List<String> ids,
                         @Param("isDivisionHead") String  isDivisionHead);

    /**
     * 根据部门id及分类id获取导办用户
@@ -85,5 +87,5 @@
     * @param userType 用户类型
     * @return 结果
     */
    List<SysUser>  queryList(@Param("userType") Integer userType,String keyWord);
    List<SysUser>  queryList(@Param("userType") Integer userType,@Param("keyWord") String keyWord);
}