diff --git a/src/main/java/com/bonus/digitalSignage/system/controller/UserController.java b/src/main/java/com/bonus/digitalSignage/system/controller/UserController.java index fc229c5..94f77ee 100644 --- a/src/main/java/com/bonus/digitalSignage/system/controller/UserController.java +++ b/src/main/java/com/bonus/digitalSignage/system/controller/UserController.java @@ -437,4 +437,21 @@ public class UserController { } + + /** + *获取权限部门 + * @return + */ + @PostMapping(value = "getOrgByUserId") + @LogAnnotation(operModul = "系统管理-用户管理", operation = "查询组织机构", operDesc = "系统级事件",operType="查询") + @PreAuthorize("@pms.hasPermission('sys:user:query')") + public ServerResponse getOrgByUserId() { + try { + List list = userService.getOrgByUserId(); + return ServerResponse.createSuccess(list); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("获取组织机构失败"); + } } diff --git a/src/main/java/com/bonus/digitalSignage/system/dao/UserDao.java b/src/main/java/com/bonus/digitalSignage/system/dao/UserDao.java index e5978b2..c21cb46 100644 --- a/src/main/java/com/bonus/digitalSignage/system/dao/UserDao.java +++ b/src/main/java/com/bonus/digitalSignage/system/dao/UserDao.java @@ -202,4 +202,10 @@ public interface UserDao { List getProjects(UserDto userDto); List getDataAuth(Long dept); + + List getOrgByUserId(List deptIds); + + List getParentId(Long deptId); + + List getChildId(Long deptId); } diff --git a/src/main/java/com/bonus/digitalSignage/system/service/UserService.java b/src/main/java/com/bonus/digitalSignage/system/service/UserService.java index 1c9a86e..eec0ce7 100644 --- a/src/main/java/com/bonus/digitalSignage/system/service/UserService.java +++ b/src/main/java/com/bonus/digitalSignage/system/service/UserService.java @@ -179,4 +179,10 @@ public interface UserService { * @date 2025/4/22 9:50 */ List getDataAuth(Long dept); + + /** + * 根据用户id查询组织机构 + * @return + */ + List getOrgByUserId(); } diff --git a/src/main/java/com/bonus/digitalSignage/system/service/impl/UserServiceImpl.java b/src/main/java/com/bonus/digitalSignage/system/service/impl/UserServiceImpl.java index 60c1306..253b32e 100644 --- a/src/main/java/com/bonus/digitalSignage/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/system/service/impl/UserServiceImpl.java @@ -7,10 +7,8 @@ import java.util.Optional; import com.bonus.digitalSignage.base.entity.DtreeVo; import com.bonus.digitalSignage.model.Role; -import com.bonus.digitalSignage.system.vo.Org; +import com.bonus.digitalSignage.system.vo.*; import com.bonus.digitalSignage.model.PasswordConfig; -import com.bonus.digitalSignage.system.vo.SelectVo; -import com.bonus.digitalSignage.system.vo.SysMenuVo; import com.bonus.digitalSignage.utils.ServerResponse; import com.bonus.digitalSignage.utils.StringHelper; import com.bonus.digitalSignage.utils.UserUtil; @@ -23,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import com.bonus.digitalSignage.system.dao.UserDao; -import com.bonus.digitalSignage.system.vo.UserDto; import com.bonus.digitalSignage.model.SysUser; import com.bonus.digitalSignage.system.service.UserService; @@ -337,4 +334,20 @@ public class UserServiceImpl implements UserService { return new ArrayList<>(); } } + + /** + * 根据用户id查询组织机构 + * @return + */ + @Override + public List getOrgByUserId() { + Long deptId = UserUtil.getLoginUser().getDept(); + //获取父类部门id + List deptIds = userDao.getParentId(deptId); + //获取子类部门id + List deptIdList = userDao.getChildId(deptId); + deptIds.addAll(deptIdList); + userDao.getOrgByUserId(deptIds); + return userDao.getOrgByUserId(deptIds); + } } diff --git a/src/main/resources/mappers/system/UserMapper.xml b/src/main/resources/mappers/system/UserMapper.xml index 063d6a6..be11415 100644 --- a/src/main/resources/mappers/system/UserMapper.xml +++ b/src/main/resources/mappers/system/UserMapper.xml @@ -285,6 +285,50 @@ ischild != - 1 OR id = #{dept} + + + insert into sys_role_user(roleId, userId) values diff --git a/src/main/resources/static/js/basic/lineManagement/child/lineFormTemp.js b/src/main/resources/static/js/basic/lineManagement/child/lineFormTemp.js index af6d426..92ce80b 100644 --- a/src/main/resources/static/js/basic/lineManagement/child/lineFormTemp.js +++ b/src/main/resources/static/js/basic/lineManagement/child/lineFormTemp.js @@ -206,15 +206,15 @@ function saveData(data) { url = dataUrl + "/tbProject/updateTbProject"; } params.departId = params.orgId_select_nodeId; - + // 处理空字段 params = handleEmptyFields(params); - + console.log("线路工程管理的新增修改", params); params = { encryptedData: encryptCBC(JSON.stringify(params)) } - + ajaxRequest(url, "POST", params, true, function () { $('.save').addClass("layui-btn-disabled").attr("disabled", true); $('.cancel').addClass("layui-btn-disabled").attr("disabled", true); @@ -240,7 +240,7 @@ function saveData(data) { function getOrgTree() { let data = []; - let url = dataUrl + '/users/getOrg'; + let url = dataUrl + '/users/getOrgByUserId'; ajaxRequest(url, "POST", null, false, function () { }, function (result) { if (result.code === 200) { @@ -306,4 +306,4 @@ function closePage(type) { if (type === 1) { parent.reloadData() } -} \ No newline at end of file +}