From 05457c090404c7e1bac404fae7e82a787182dede Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Fri, 2 Dec 2022 15:58:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E7=94=A8=E6=88=B7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=88todo:=E8=A7=92=E8=89=B2=EF=BC=8C=E9=83=A8?= =?UTF-8?q?=E9=97=A8=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=88=86=E9=85=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/modules/system/service/impl/UserServiceImpl.java | 2 +- nladmin-ui/src/views/system/user/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java index c6b26bc..e75011a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java @@ -220,7 +220,7 @@ public class UserServiceImpl implements UserService { delCaches(user.getUser_id(), user.getUsername()); } String collectSql = ids.stream().map(a -> String.valueOf(a)).collect(Collectors.joining("','")); - WQLObject.getWQLObject("sys_user").delete("user_id in ('"+collectSql+"'"); + WQLObject.getWQLObject("sys_user").delete("user_id in ('"+collectSql+"')"); //删除用户部门，角色关系表 userRelateService.deleteDeptRelate(ids); userRelateService.deleteRoleRelate(ids); diff --git a/nladmin-ui/src/views/system/user/index.vue b/nladmin-ui/src/views/system/user/index.vue index 2bc99ba..0221f8e 100644 --- a/nladmin-ui/src/views/system/user/index.vue +++ b/nladmin-ui/src/views/system/user/index.vue @@ -229,7 +229,7 @@ export default { name: 'User', components: { Treeselect, crudOperation, rrOperation, udOperation, pagination }, cruds() { - return CRUD({ title: '用户', url: 'api/users', crudMethod: { ...crudUser }}) + return CRUD({ title: '用户', idField: 'user_id', url: 'api/users', crudMethod: { ...crudUser }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], // 数据字典 From 8867d3fee681a04faab5337e6b14a7b02a13591a Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Fri, 2 Dec 2022 16:13:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/modules/system/service/impl/UserServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java index e75011a..bf97a8a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java @@ -42,6 +42,7 @@ import org.nl.modules.tools.MapOf; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.ResultBean; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.WqlUtil; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Pageable; @@ -98,7 +99,7 @@ public class UserServiceImpl implements UserService { map.put("deptIds","('"+collectSql+"')"); } map.put("flag","1"); - JSONObject jsonObject = WQL.getWO("SYS_USER").addParamMap(map).pageQuery(pageable.getPageNumber(), pageable.getPageSize(), "user_id"); + JSONObject jsonObject = WQL.getWO("SYS_USER").addParamMap(map).pageQuery(WqlUtil.getHttpContext(pageable),"user_id desc"); return jsonObject; }