wks hace 2 años
padre
commit
7efe7a3053

+ 0 - 2
src/main/java/com/ydtech/modules/admin/controller/SysLoginController.java

@@ -201,8 +201,6 @@ public class SysLoginController {
 //
         // 用户信息
         SysUser user = sysUserService.getById(username);
-
-
         /**
          *  多个系统登录  添加默认参数解决手机端登陆问题
          * */

+ 1 - 1
src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -412,7 +412,7 @@ public class SysUserController extends BaseController {
         return HttpResult.ok(sysUserService.gainUserPage(pageDto));
     }
 
-    @ApiOperation(value = "渠道和个代的用户查询分页")
+    @ApiOperation(value = "渠道、个代、电销 的用户查询分页")
     @PostMapping(value = "/findUserList")
     public HttpResult findUserList(@RequestBody PageDto<SysUserDto> pageDto) {
         if (pageDto.getDto().getDeptId() == null) {

+ 4 - 3
src/main/java/com/ydtech/modules/admin/model/dto/SysUserDto.java

@@ -4,6 +4,7 @@ import com.ydtech.core.page.PageRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 用户DTO
@@ -11,11 +12,11 @@ import lombok.Data;
  * @author: lig
  * @date: 2023-06-29
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel
 public class SysUserDto extends PageRequest {
 
-
     @ApiModelProperty("用户ID(工号)")
     private String userId;
 
@@ -37,7 +38,7 @@ public class SysUserDto extends PageRequest {
     @ApiModelProperty("领导人")
     private String leaderName;
 
-    @ApiModelProperty("代理个代标识")
+    @ApiModelProperty("代理个代标识 1 渠道  2 个代 3 电销")
     private Integer agentFlag;
 
     private int pageNum;
@@ -45,5 +46,5 @@ public class SysUserDto extends PageRequest {
     private int pageSize;
 
     @ApiModelProperty("内部机构id")
-    private String  deptNBId;
+    private String deptNBId;
 }