用户导入导出bug

部门查询接口

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java

@@ -399,4 +399,14 @@ public class SysDepartController {
         }
         return Result.error("文件导入失败！");
     }
+
+
+	@RequestMapping(value = "/queryMyDeptList", method = RequestMethod.GET)
+	public Result<List<SysDepart>> queryMyDeptList() {
+		Result<List<SysDepart>> result = new Result<>();
+		List<SysDepart> departList = this.sysDepartService.queryMyDeptList();
+		result.setResult(departList);
+		result.setSuccess(true);
+		return result;
+	}
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -1,25 +1,21 @@
 package org.jeecg.modules.system.entity;
 
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.io.Serializable;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+import java.util.Date;
 
 /**
  * <p>
@@ -312,7 +308,7 @@ public class SysUser implements Serializable {
     @ApiModelProperty(value = "人员类别")
     private java.lang.String nPersonnelType;
     /**简历*/
-    @Excel(name = "简历", width = 15)
+//    @Excel(name = "简历", width = 15)
     @ApiModelProperty(value = "简历")
     private byte[] nResume;
     /**家庭成员*/

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.model.DepartIdModel;
 import org.jeecg.modules.system.model.SysDepartTreeModel;
+
 import java.util.List;
 
 /**
@@ -121,4 +122,6 @@ public interface ISysDepartService extends IService<SysDepart>{
 
     //根据当前人员查询上级部门的负责人
     List<String> getDepartByUsernameByOrg(String username,String orgCode);
+
+    List<SysDepart> queryMyDeptList();
 }

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

@@ -1,8 +1,9 @@
 package org.jeecg.modules.system.service.impl;
 
-import java.util.*;
-
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.netty.util.internal.StringUtil;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CommonConstant;
@@ -19,10 +20,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import io.netty.util.internal.StringUtil;
+import java.util.*;
 
 /**
  * <p>
@@ -261,6 +259,20 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 		return baseMapper.getDepartByUsernameByOrg(username,orgCode);
 	}
 
+	@Override
+	public List<SysDepart> queryMyDeptList() {
+		LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
+		query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
+		query.eq(SysDepart::getOrgType, 2);
+		query.orderByAsc(SysDepart::getDepartOrder);
+		//根据公司id查询编码，通过编码过滤部门
+		LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+		SysDepart sysDepart= this.baseMapper.selectById(sysUser.getOrgCode());
+		query.like(SysDepart::getOrgCode,sysDepart.getOrgCode());
+		List<SysDepart> list = this.list(query);
+		return list;
+	}
+
 	/**
 	 * <p>
 	 * 根据关键字搜索相关的部门数据