root/nl-sso-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server

Browse Source
This commit is contained in:
ludj
2022-12-02 17:16:31 +08:00
parent 1840ceec58 8867d3fee6
commit d004edc77d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java
View File

@@ -42,6 +42,7 @@ import org.nl.modules.tools.MapOf;
import org.nl.modules.wql.WQL; import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.ResultBean; import org.nl.modules.wql.core.bean.ResultBean;
import org.nl.modules.wql.core.bean.WQLObject; 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.CacheConfig;
import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.annotation.Cacheable;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
@@ -98,7 +99,7 @@ public class UserServiceImpl implements UserService {
map.put("deptIds","('"+collectSql+"')"); map.put("deptIds","('"+collectSql+"')");
} }
map.put("flag","1"); 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; return jsonObject;
} }
@@ -220,7 +221,7 @@ public class UserServiceImpl implements UserService {
delCaches(user.getUser_id(), user.getUsername()); delCaches(user.getUser_id(), user.getUsername());
} }
String collectSql = ids.stream().map(a -> String.valueOf(a)).collect(Collectors.joining("','")); 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.deleteDeptRelate(ids);
userRelateService.deleteRoleRelate(ids); userRelateService.deleteRoleRelate(ids);

2
nladmin-ui/src/views/system/user/index.vue
View File

@@ -220,7 +220,7 @@ export default {
name: 'User', name: 'User',
components: { Treeselect, crudOperation, rrOperation, udOperation, pagination }, components: { Treeselect, crudOperation, rrOperation, udOperation, pagination },
cruds() { 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()], mixins: [presenter(), header(), form(defaultForm), crud()],
// 数据字典 // 数据字典