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

@@ -18,6 +18,7 @@
public interface SysUserMapper extends BaseMapper<SysUser> {

    SysUser getUserById(Long id);

    SysUser getUserByAccount(String account);

    /**
@@ -25,7 +26,17 @@
     *
     * @return 参数配置信息
     */
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,@Param("userType") String userType);
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,
                                          @Param("userType") String userType,
                                          @Param("userName") String userName,
                                          @Param("ids") List<String> ids,
                                          @Param("isDivisionHead") String  isDivisionHead);



    SysUser selectData(@Param("userId") String userId,
                       @Param("phonenumber") String phonenumber,
                       @Param("loginName") String loginName);


    /**
@@ -58,7 +69,10 @@
     *
     * @return 结果
     */
    public int selectNum(String userType);
    public int selectNum(@Param("userType") String userType,
                         @Param("userName") String userName,
                         @Param("ids") List<String> ids,
                         @Param("isDivisionHead") String  isDivisionHead);

    /**
     * 根据部门id及分类id获取导办用户
@@ -66,4 +80,12 @@
     * @return 结果
     */
    List<SysUser> selectListByDepartmentId(@Param("list") List<String> list,@Param("classifyIdFront") String classifyIdFront,@Param("classifyIdAfter") String classifyIdAfter);


    /**
     * 查询用户列表（不分页）
     * @param userType 用户类型
     * @return 结果
     */
    List<SysUser>  queryList(@Param("userType") Integer userType,@Param("keyWord") String keyWord);
}