Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-24 ff0d6cc27326837e5797ece1aa1a2c1bf0a9930f

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

@@ -26,11 +26,15 @@
     *
     * @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);



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


    /**
@@ -63,7 +67,7 @@
     *
     * @return 结果
     */
    public int selectNum(String userType);
    public int selectNum(@Param("userType") String userType,@Param("userName") String userName);

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