关于测边菜单遮挡内容问题详细说明 #2255

部门管理员添加上级用户时缺失负责部门列issues/I2SDU1 批量导入部门以后，不能追加下一级部门 #2245

关于测边菜单遮挡内容问题详细说明 #2255
部门管理员添加上级用户时缺失负责部门列issues/I2SDU1 批量导入部门以后，不能追加下一级部门 #2245
zhangdaiscott
1 parent 4bf7eb73
Showing 3 changed files with 16 additions and 1 deletions
ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
ant-design-vue-jeecg/src/views/system/modules/DeptUserInfo.vue
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
@@ -131,6 +131,11 @@
       //--update-begin----author:scott---date:20190320------for:根据后台菜单配置，判断是否路由菜单字段，动态选择是否生成路由（为了支持参数URL菜单）------
       //this.menus = this.mainRouters.find((item) => item.path === '/').children;
       this.menus = this.permissionMenuList
+      
+      //--update-begin----author:liusq---date:20210223------for:关于测边菜单遮挡内容问题详细说明 #2255
+      this.collapsed=!this.sidebarOpened;
+      //--update-begin----author:liusq---date:20210223------for:关于测边菜单遮挡内容问题详细说明 #2255
+  
       // 根据后台配置菜单，重新排序加载路由信息
       //console.log('----加载菜单逻辑----')
       //console.log(this.mainRouters)
@@ -123,6 +123,7 @@
       return {
         description: '用户信息',
         currentDeptId: '',
+        currentDept: {},
         // 表头
         columns: [{
             title: '用户账号',
@@ -260,6 +261,7 @@
       open(record) {
         //console.log(record);
         this.currentDeptId = record.id;
+        this.currentDept = record;
         this.loadData(1);
       },
       clearList() {
@@ -291,8 +293,12 @@
           this.$message.error("请选择一个部门!")
         } else {
           this.$refs.modalForm.departDisabled = true;
+          //初始化负责部门
           this.$refs.modalForm.userDepartModel.departIdList = [this.currentDeptId];  //传入一个部门id
           this.$refs.modalForm.add();
+          //update-begin---author:liusq   Date:20210223  for：https://gitee.com/jeecg/jeecg-boot/issues/I2SDU1------------
+          this.$refs.modalForm.resultDepartOptions=[{key:this.currentDept.key,title:this.currentDept.title}]
+          //update-end---author:liusq   Date:20210223  for：https://gitee.com/jeecg/jeecg-boot/issues/I2SDU1------------
           this.$refs.modalForm.title = "新增";
         }
       },
@@ -16,6 +16,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.ImportExcelUtil;
+import org.jeecg.common.util.YouBianCodeUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysUser;
@@ -332,7 +333,7 @@ public class SysDepartController {
             params.setNeedSave(true);
             try {
             	// orgCode编码长度
-            	int codeLength = 3;
+				int codeLength = YouBianCodeUtil.zhanweiLength;
                 listSysDeparts = ExcelImportUtil.importExcel(file.getInputStream(), SysDepart.class, params);
                 //按长度排序
                 Collections.sort(listSysDeparts, new Comparator<SysDepart>() {
@@ -362,6 +363,9 @@ public class SysDepartController {
                 	}else{
                 		sysDepart.setParentId("");
 					}
+					//update-begin---author:liusq   Date:20210223  for：批量导入部门以后，不能追加下一级部门 #2245------------
+					sysDepart.setOrgType(sysDepart.getOrgCode().length()/codeLength+"");
+					//update-end---author:liusq   Date:20210223  for：批量导入部门以后，不能追加下一级部门 #2245------------
 					sysDepart.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
 					ImportExcelUtil.importDateSaveOne(sysDepart, ISysDepartService.class, errorMessageList, num, CommonConstant.SQL_INDEX_UNIQ_DEPART_ORG_CODE);
 					num++;