wks 2 سال پیش
والد
کامیت
5bd4fe8b68

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

@@ -413,8 +413,7 @@ public class SysUserController extends BaseController {
     @PostMapping(value = "/findUserList")
     public HttpResult findUserList(@RequestBody PageDto<SysUserDto> pageDto) {
         if (pageDto.getDto().getDeptId() == null) {
-            BaseController baseController = new BaseController();
-            pageDto.getDto().setDeptId(baseController.getDeptId());
+            pageDto.getDto().setDeptId(BaseController.getDeptId());
         }
         return HttpResult.ok(sysUserService.findUserList(pageDto));
     }
@@ -423,8 +422,7 @@ public class SysUserController extends BaseController {
     @PostMapping(value = "/findBackUserList")
     public HttpResult findBackUserList(@RequestBody SysUserDto sysUserDto) {
         if (sysUserDto.getDeptId() == null) {
-            BaseController baseController = new BaseController();
-            sysUserDto.setDeptId(baseController.getDeptId());
+            sysUserDto.setDeptId(BaseController.getDeptId());
         }
         return HttpResult.ok(sysUserService.findBackUserList(sysUserDto));
     }
@@ -433,8 +431,7 @@ public class SysUserController extends BaseController {
     @PostMapping(value = "/findBackUserList1")
     public HttpResult findBackUserList1(@RequestBody SysUserDto sysUserDto) {
         if (sysUserDto.getDeptId() == null) {
-            BaseController baseController = new BaseController();
-            sysUserDto.setDeptId(baseController.getDeptId());
+            sysUserDto.setDeptId(BaseController.getDeptId());
         }
         return HttpResult.ok(sysUserService.findBackUserList1(sysUserDto));
     }

+ 1 - 1
src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -248,7 +248,7 @@
         psd.id as pDeptId,
         psd.name as pDeptName,
         su.create_time as submitTime,
-        sut.approveTime as approveTime
+        sut.approveTime as approveTime,
         sut.approve_by as approvBy
         FROM
         sys_user su