|
|
@@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
+import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
import org.jeecg.common.config.TenantContext;
|
|
|
import org.jeecg.common.constant.CacheConstant;
|
|
|
import org.jeecg.common.constant.CommonConstant;
|
|
|
@@ -18,6 +19,7 @@ import org.jeecg.common.util.ImportExcelUtil;
|
|
|
import org.jeecg.common.util.YouBianCodeUtil;
|
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
|
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
|
|
|
+import org.jeecg.modules.base.service.BaseCommonService;
|
|
|
import org.jeecg.modules.system.entity.SysDepart;
|
|
|
import org.jeecg.modules.system.entity.SysUser;
|
|
|
import org.jeecg.modules.system.model.DepartIdModel;
|
|
|
@@ -65,6 +67,8 @@ public class SysDepartController {
|
|
|
private ISysUserService sysUserService;
|
|
|
@Autowired
|
|
|
private ISysUserDepartService sysUserDepartService;
|
|
|
+ @Autowired
|
|
|
+ private BaseCommonService baseCommonService ;
|
|
|
/**
|
|
|
* 查询数据 查出我的部门,并以树结构数据格式响应给前端
|
|
|
*
|
|
|
@@ -388,6 +392,7 @@ public class SysDepartController {
|
|
|
return mv;
|
|
|
}
|
|
|
|
|
|
+ @AutoLog
|
|
|
@RequestMapping(value = "/initializationImportExcel", method = RequestMethod.POST)
|
|
|
public Result<?> initializationImportExcel(HttpServletRequest request, HttpServletResponse response) {
|
|
|
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
GDW