20220825

人力资源管理-用户信息列表接口修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/controller/UserInfoController.java

@@ -30,7 +30,7 @@ public class UserInfoController {
      */
     @ApiOperation(value = "用户信息列表")
     @GetMapping(value = "/list")
-    public ResponseEntity<IPage<SysUserInfo>> list(Page<SysUserInfo> page,@RequestBody SysUserInfo sysUserInfo) throws Exception{
+    public ResponseEntity<IPage<SysUserInfo>> list(Page<SysUserInfo> page, SysUserInfo sysUserInfo) throws Exception{
         QueryWrapper<SysUserInfo> sysUserInfoQueryWrapper = QueryWrapperGenerator.buildQueryCondition(sysUserInfo, SysUserInfo.class);
         IPage<SysUserInfo> list = userInfoService.list(page, sysUserInfoQueryWrapper);
         return ResponseEntity.ok (list);

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/mapper/xml/SysUserInfoMapper.xml

@@ -12,7 +12,8 @@
 			(SELECT NAME FROM sys_office b WHERE b.id = a.department) AS department,
 			(SELECT NAME FROM sys_role c WHERE c.id = a.position) AS position,
 			highest_education,
-			(SELECT e.label FROM sys_dict_type d LEFT JOIN sys_dict_value e ON d.id = e.dict_type_id WHERE d.type = #{userStatus} AND e.`value` = a.user_type) AS user_status
+			(SELECT e.label FROM sys_dict_type d LEFT JOIN sys_dict_value e ON d.id = e.dict_type_id WHERE d.type = #{userStatus} AND e.`value` = a.user_type) AS user_status,
+			entry_date
 		FROM
 			sys_user_info a
 		${ew.customSqlSegment}