|
@@ -18,10 +18,8 @@ import org.jeecg.common.system.vo.LoginUser;
|
|
|
import org.jeecg.common.util.PasswordUtil;
|
|
|
import org.jeecg.common.util.RedisUtil;
|
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
|
-import org.jeecg.modules.system.entity.SysDepart;
|
|
|
-import org.jeecg.modules.system.entity.SysUser;
|
|
|
-import org.jeecg.modules.system.entity.SysUserDepart;
|
|
|
-import org.jeecg.modules.system.entity.SysUserRole;
|
|
|
+import org.jeecg.modules.system.entity.*;
|
|
|
+import org.jeecg.modules.system.mapper.SysUserMapper;
|
|
|
import org.jeecg.modules.system.model.DepartIdModel;
|
|
|
import org.jeecg.modules.system.model.SysUserDepartsVO;
|
|
|
import org.jeecg.modules.system.service.*;
|
|
@@ -76,6 +74,8 @@ public class SysUserController {
|
|
|
|
|
|
@Autowired
|
|
|
private IUserCompanyService userCompanyService;
|
|
|
+ @Autowired
|
|
|
+ private SysUserMapper sysUserMapper;
|
|
|
|
|
|
|
|
|
@RequestMapping(value = "/getRoleInfo", method = RequestMethod.GET)
|
|
@@ -100,6 +100,26 @@ public class SysUserController {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ @RequestMapping(value = "/getAllUserList", method = RequestMethod.GET)
|
|
|
+ public Result<List<SysUserVo>> getAllList() {
|
|
|
+ Result<List<SysUserVo>> result = new Result<>();
|
|
|
+ try {
|
|
|
+
|
|
|
+ List<SysUserVo> userList = sysUserService.getAllUser();
|
|
|
+ result.setSuccess(true);
|
|
|
+ result.setResult(userList);
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ result.setSuccess(false);
|
|
|
+ result.setMessage("请求失败");
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
|
|
@RequiresPermissions("user:add")
|
|
|
public Result<SysUser> add(@RequestBody JSONObject jsonObject) {
|