多组织

src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java

@@ -67,7 +67,7 @@ public class NgAlainController {
         userObjcet.put("personnelId", user.getPersonnelId());
         List<SysDepart> sysDeparts=iSysDepartService.getByType("1");
         //判断组织id是否为空
-        if(StringUtils.isNotBlank(orgId)&&!orgId.equals("null")){
+        if(StringUtils.isNotBlank(orgId)&&!orgId.equals("null")&&!orgId.equals("undefined")){
             //不为空则不变
 //            FdPersonnel fdPersonnel=iFdPersonnelService.getById(user.getPersonnelId());
             userObjcet.put("pkOrg", orgId);

src/main/java/org/jeecg/modules/system/controller/SysDepartController.java

@@ -65,10 +65,10 @@ public class SysDepartController {
 	 * @return
 	 */
 	@RequestMapping(value = "/queryTreeList", method = RequestMethod.GET)
-	public Result<List<SysDepartTreeModel>> queryTreeList() {
+	public Result<List<SysDepartTreeModel>> queryTreeList(SysDepart sysDepart) {
 		Result<List<SysDepartTreeModel>> result = new Result<>();
 		try {
-			List<SysDepartTreeModel> list = sysDepartService.queryTreeList();
+			List<SysDepartTreeModel> list = sysDepartService.queryTreeList(sysDepart);
 			result.setResult(list);
 			result.setSuccess(true);
 		} catch (Exception e) {
@@ -84,10 +84,10 @@ public class SysDepartController {
 	 */
 	@RequestMapping(value = "/queryTreeList1", method = RequestMethod.GET)
 	@RequiresPermissions("url:depart:view")
-	public Result<List<SysDepartTreeModel>> queryTreeList1() {
+	public Result<List<SysDepartTreeModel>> queryTreeList1(SysDepart sysDepart) {
 		Result<List<SysDepartTreeModel>> result = new Result<>();
 		try {
-			List<SysDepartTreeModel> list = sysDepartService.queryTreeList();
+			List<SysDepartTreeModel> list = sysDepartService.queryTreeList(sysDepart);
 			result.setResult(list);
 			result.setSuccess(true);
 		} catch (Exception e) {
@@ -194,7 +194,7 @@ public class SysDepartController {
 	 * @return
 	 */
 	  @RequestMapping(value = "/queryIdTree", method = RequestMethod.GET) 
-	  public Result<List<DepartIdModel>> queryIdTree() {	  
+	  public Result<List<DepartIdModel>> queryIdTree(SysDepart sysDepart) {
 		 Result<List<DepartIdModel>> result = new Result<List<DepartIdModel>>(); 
 		 List<DepartIdModel> idList;
 		 try {
@@ -202,7 +202,7 @@ public class SysDepartController {
 		 if(idList != null && idList.size() > 0) {
 		 result.setResult(idList); result.setSuccess(true);
 		 }else {
-			 sysDepartService.queryTreeList();
+			 sysDepartService.queryTreeList(sysDepart);
 			 idList = FindsDepartsChildrenUtil.wrapDepartIdModel();
 			 result.setResult(idList); result.setSuccess(true);
 		 }

src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java

@@ -11,6 +11,7 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.jeecg.common.api.vo.Result;
@@ -90,11 +91,14 @@ public class SysPermissionController {
 	 */
 	@RequestMapping(value = "/list1", method = RequestMethod.GET)
 	@RequiresPermissions("url:menu:view")
-	public Result<List<SysPermissionTree>> list1() {
+	public Result<List<SysPermissionTree>> list1(SysPermission sysPermission) {
 		Result<List<SysPermissionTree>> result = new Result<>();
 		try {
 			LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<SysPermission>();
 			query.eq(SysPermission::getDelFlag, 0);
+			if(StringUtils.isNotBlank(sysPermission.getPkOrg())){
+				query.eq(SysPermission::getPkOrg,sysPermission.getPkOrg());
+			}
 			query.orderByAsc(SysPermission::getSortNo);
 			List<SysPermission> list = sysPermissionService.list(query);
 			List<SysPermissionTree> treeList = new ArrayList<>();

src/main/java/org/jeecg/modules/system/service/ISysDepartService.java

@@ -29,7 +29,7 @@ public interface ISysDepartService extends IService<SysDepart>{
      * 查询所有部门信息,并分节点进行显示
      * @return
      */
-    List<SysDepartTreeModel> queryTreeList();
+    List<SysDepartTreeModel> queryTreeList(SysDepart sysDepart);
 
     /**
      * 保存部门数据

src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.util.YouBianCodeUtil;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.mapper.SysDepartMapper;
@@ -43,9 +44,12 @@ public class SysDepartServiceImpl<T> extends ServiceImpl<SysDepartMapper, SysDep
 	 * queryTreeList 对应 queryTreeList 查询所有的部门数据,以树结构形式响应给前端
 	 */
 	@Override
-	public List<SysDepartTreeModel> queryTreeList() {
+	public List<SysDepartTreeModel> queryTreeList(SysDepart sysDepart) {
 		LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
 		query.eq(SysDepart::getDelFlag, 0);
+		if(StringUtils.isNotBlank(sysDepart.getPkOrg())){
+			query.eq(SysDepart::getPkOrg,sysDepart.getPkOrg());
+		}
 		query.orderByAsc(SysDepart::getDepartOrder);
 		List<SysDepart> list = this.list(query);
 		// 调用wrapTreeDataToTreeList方法生成树状数据