1.修复后线人员配置角色后不展示用户

2.修复新增用户时 传入时间类型转换异常
3.将后线人员管理接口调整至findUserList

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -347,19 +347,13 @@ 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) {
-        //获取用户角色
-        BaseController baseController = new BaseController();
-//        if (RoleConstants.R22.getCode().equals(pageDto.getDto().getRoleId())) {
-//            pageDto.getDto().setRoleId("17,18,22,23,24,25,28,29,30,31,32,38");
-//        }
-        //设置登录用户的部门
-//        if ("".equals(pageDto.getDto().getDeptId()) || null == pageDto.getDto().getDeptId()) {
-//            pageDto.getDto().setDeptId(baseController.getDeptId());
-//        }
-
+        if (pageDto.getDto().getDeptId() == null){
+            BaseController baseController = new BaseController();
+            pageDto.getDto().setDeptId(baseController.getDeptId());
+        }
         return HttpResult.ok(sysUserService.findUserList(pageDto));
     }
 

src/main/java/com/ydtech/modules/admin/model/SysUserInfo.java

@@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -66,6 +67,7 @@ public class SysUserInfo implements Serializable {
 
     @ApiModelProperty(value = "出生日期")
     @TableField(value = "birthday")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate birthday;
 
     @ApiModelProperty(value = "婚姻状况")
@@ -99,6 +101,7 @@ public class SysUserInfo implements Serializable {
 
     @ApiModelProperty(value = "毕业时间")
     @TableField(value = "graduation_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date graduationTime;
 
     @ApiModelProperty(value = "原工作单位")
@@ -107,6 +110,7 @@ public class SysUserInfo implements Serializable {
 
     @ApiModelProperty(value = "入司时间")
     @TableField(value = "entry_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date entryTime;
 
     @ApiModelProperty(value = "代理人资格证号")

src/main/java/com/ydtech/modules/admin/model/dto/SysUserDto.java

@@ -35,5 +35,5 @@ public class SysUserDto extends PageRequest {
     private String status;
 
     @ApiModelProperty("代理个代标识")
-    private String agentFlag;
+    private Integer agentFlag;
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -78,7 +78,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (sysUserVO.getAgentFlag() == null) {
             throw new SystemException("必传标识未传递");
         }
-
         return sysUserMapper.findUserList(page, sysUserVO);
     }
 

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -162,9 +162,12 @@
             <if test='user.roleId !=null and user.roleId!=""  '>
                 and t3.role_id in (${user.roleId})
             </if>
-            <if test="user.agentFlag !=null and user.agentFlag!='' ">
+            <if test="user.agentFlag !=null and user.agentFlag != 0 ">
                 and sd.management_source = #{user.agentFlag}
             </if>
+            <if test="user.agentFlag != null and user.agentFlag == 0">
+                and sd.management_source is null
+            </if>
         </if>
     </select>