Parcourir la source

修改:接口参数修改

GDW il y a 2 mois
Parent
commit
c9e1fe778b

+ 25 - 10
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -2022,18 +2022,33 @@ public class SysUserController {
     /**
      * 用户符合查询2
      */
-    @PostMapping("/userComplexConditionTwo")
-    public Result<IPage<SysUser>> userComplexConditionTwo(
-            @RequestParam(name = "roleId", required = false) String roleId,
-            @RequestParam(name = "deptId", required = false) String deptId,
-            @RequestParam(name = "appId", required = false) String appId,
-            @RequestParam(name = "relName", required = false) String relName,
-            @RequestParam(name = "username", required = false) String username,
-            @RequestParam(name = "pageNo", required = false) Integer pageNo,
-            @RequestParam(name = "pageSize", required = false) Integer pageSize) {
+//    @PostMapping("/userComplexConditionTwo")
+//    public Result<IPage<SysUser>> userComplexConditionTwo(
+//            @RequestParam(name = "roleId", required = false) String roleId,
+//            @RequestParam(name = "deptId", required = false) String deptId,
+//            @RequestParam(name = "appId", required = false) String appId,
+//            @RequestParam(name = "relName", required = false) String relName,
+//            @RequestParam(name = "username", required = false) String username,
+//            @RequestParam(name = "pageNo", required = false) Integer pageNo,
+//            @RequestParam(name = "pageSize", required = false) Integer pageSize) {
+//
+//        Result<IPage<SysUser>> iPageResult = sysUserService.userComplexConditionTwoService(roleId, deptId, appId, relName, username, pageNo, pageSize);
+//
+//        return iPageResult;
+//
+//
+//    }
 
+    @PostMapping("/userComplexConditionTwo")
+    public Result<IPage<SysUser>> userComplexConditionTwo(@RequestBody Map<String, String> requestParam) {
+        String roleId = requestParam.get("roleId");
+        String deptId = requestParam.get("deptId");
+        String appId = requestParam.get("appId");
+        String relName = requestParam.get("relName");
+        String username = requestParam.get("username");
+        String pageNo = requestParam.get("pageNo");
+        String pageSize = requestParam.get("pageSize");
         Result<IPage<SysUser>> iPageResult = sysUserService.userComplexConditionTwoService(roleId, deptId, appId, relName, username, pageNo, pageSize);
-
         return iPageResult;
 
 

+ 1 - 1
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -476,5 +476,5 @@ public interface ISysUserService extends IService<SysUser> {
 	/**
 	 * 用户复合查询2
 	 */
-	Result<IPage<SysUser>> userComplexConditionTwoService(String roleId, String deptId, String appId, String relName, String username, Integer pageNo, Integer pageSize);
+	Result<IPage<SysUser>> userComplexConditionTwoService(String roleId, String deptId, String appId, String relName, String username, String pageNo, String pageSize);
 }

+ 3 - 7
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -2270,19 +2270,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 
 	@Override
-	public Result<IPage<SysUser>> userComplexConditionTwoService(String roleId, String deptId, String appId, String relName, String username, Integer pageNo, Integer pageSize) {
-
+	public Result<IPage<SysUser>> userComplexConditionTwoService(String roleId, String deptId, String appId, String relName, String username, String pageNo, String pageSize) {
 		Page<SysUser> sysUserPage = new Page<>();
 		if (pageNo != null) {
-			sysUserPage.setCurrent(pageNo);
+			sysUserPage.setCurrent(Long.getLong(pageNo));
 		}
 		if (pageSize != null) {
-			sysUserPage.setSize(pageSize);
+			sysUserPage.setSize(Long.getLong(pageSize));
 		}
-
 		Page<SysUser> sysUserPageList = userMapper.userComplexConditionTwoMapper(sysUserPage, roleId, deptId, appId, relName, username);
-		System.out.println(sysUserPageList);
-
 		Result<IPage<SysUser>> result = new Result<>();
 		result.setSuccess(true);
 		result.setResult(sysUserPageList);