|
@@ -17,18 +17,18 @@ import io.swagger.annotations.ApiOperation;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.shiro.SecurityUtils;
|
|
import org.apache.shiro.SecurityUtils;
|
|
-import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
|
-import org.apache.shiro.authz.annotation.RequiresRoles;
|
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.aspect.annotation.PermissionData;
|
|
import org.jeecg.common.aspect.annotation.PermissionData;
|
|
import org.jeecg.common.constant.CommonConstant;
|
|
import org.jeecg.common.constant.CommonConstant;
|
|
import org.jeecg.common.system.api.ISysBaseAPI;
|
|
import org.jeecg.common.system.api.ISysBaseAPI;
|
|
-import org.jeecg.modules.base.service.BaseCommonService;
|
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.common.system.util.JwtUtil;
|
|
import org.jeecg.common.system.util.JwtUtil;
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
-import org.jeecg.common.util.*;
|
|
|
|
-import org.jeecg.modules.bytedance.advertise.vo.IndustryVo;
|
|
|
|
|
|
+import org.jeecg.common.util.ImportExcelUtil;
|
|
|
|
+import org.jeecg.common.util.PasswordUtil;
|
|
|
|
+import org.jeecg.common.util.RedisUtil;
|
|
|
|
+import org.jeecg.common.util.oConvertUtils;
|
|
|
|
+import org.jeecg.modules.base.service.BaseCommonService;
|
|
import org.jeecg.modules.bytedance.common.utils.Check;
|
|
import org.jeecg.modules.bytedance.common.utils.Check;
|
|
import org.jeecg.modules.system.entity.*;
|
|
import org.jeecg.modules.system.entity.*;
|
|
import org.jeecg.modules.system.model.DepartIdModel;
|
|
import org.jeecg.modules.system.model.DepartIdModel;
|
|
@@ -83,9 +83,6 @@ public class SysUserController {
|
|
@Autowired
|
|
@Autowired
|
|
private ISysUserDepartService sysUserDepartService;
|
|
private ISysUserDepartService sysUserDepartService;
|
|
|
|
|
|
- @Autowired
|
|
|
|
- private ISysUserRoleService userRoleService;
|
|
|
|
-
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private ISysDepartRoleUserService departRoleUserService;
|
|
private ISysDepartRoleUserService departRoleUserService;
|
|
|
|
|