diff --git a/lms/nladmin-system/src/main/java/org/nl/sso/system/service/impl/RoleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/sso/system/service/impl/RoleServiceImpl.java index 2d0f6417b..6c1dd18cf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/sso/system/service/impl/RoleServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/sso/system/service/impl/RoleServiceImpl.java @@ -56,9 +56,13 @@ public class RoleServiceImpl implements RoleService { public JSONObject queryAll(Map whereJson, Pageable page) { WQLObject wo = WQLObject.getWQLObject("sys_role"); WQLObject rmTab = WQLObject.getWQLObject("sys_roles_menus"); - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "", "update_time desc"); + String sql = ""; + Object blurry = whereJson.get("blurry"); + if (blurry !=null){ + sql = "name like '%"+blurry+"%'"; + } + ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), sql, "update_time desc"); final JSONObject json = rb.pageResult(); - JSONArray arr = json.getJSONArray("content"); for (int i = 0; i < arr.size(); i++) { JSONObject roleObj = arr.getJSONObject(i); diff --git a/lms/nladmin-system/src/main/java/org/nl/sso/system/service/impl/UserRelateServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/sso/system/service/impl/UserRelateServiceImpl.java index 6ff20051f..0c2fca6ce 100644 --- a/lms/nladmin-system/src/main/java/org/nl/sso/system/service/impl/UserRelateServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/sso/system/service/impl/UserRelateServiceImpl.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.util.HashSet; import java.util.Set; import java.util.stream.Collectors; @@ -82,17 +83,21 @@ public class UserRelateServiceImpl implements UserRelateService { @Transactional public void updateDeptRelate(Long user, Set deptIds) { if (user !=null){ - this.deleteDeptRelate(user,deptIds); + HashSet userSet = new HashSet<>(); + userSet.add(user); + this.deleteDeptRelate(userSet); this.inserDeptRelate(user,deptIds); } } @Override @Transactional - public void updateRoleRelate(Long user, Set RoleIds) { - if (user !=null){ - this.deleteRoleRelate(user,RoleIds); - this.inserRoleRelate(user,RoleIds); + public void updateRoleRelate(Long role, Set RoleIds) { + if (role !=null){ + HashSet roleSet = new HashSet<>(); + roleSet.add(role); + this.deleteRoleRelate(roleSet); + this.inserRoleRelate(role,RoleIds); } } }