Commit c1c2f1e4 by zhangdaihao

1.解决SqlServer、oracle,demo表少sys_org_code字段

2.解决用户操作无权限问题,去掉权限注解
3.解决用户列表,无编辑按钮问题,去掉前端权限指令
parent 145cdfa8
...@@ -118,9 +118,9 @@ ...@@ -118,9 +118,9 @@
</template> </template>
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)" v-has="'user:edit'">编辑</a> <a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" v-has="'user:edit'"/> <a-divider type="vertical"/>
<a-dropdown> <a-dropdown>
<a class="ant-dropdown-link"> <a class="ant-dropdown-link">
......
...@@ -13,8 +13,6 @@ import java.util.UUID; ...@@ -13,8 +13,6 @@ import java.util.UUID;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
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.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.PasswordUtil; import org.jeecg.common.util.PasswordUtil;
...@@ -24,7 +22,6 @@ import org.jeecg.modules.system.entity.SysUserDepart; ...@@ -24,7 +22,6 @@ import org.jeecg.modules.system.entity.SysUserDepart;
import org.jeecg.modules.system.entity.SysUserRole; import org.jeecg.modules.system.entity.SysUserRole;
import org.jeecg.modules.system.model.DepartIdModel; import org.jeecg.modules.system.model.DepartIdModel;
import org.jeecg.modules.system.model.SysUserDepartsVO; import org.jeecg.modules.system.model.SysUserDepartsVO;
import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecg.modules.system.service.ISysUserDepartService; import org.jeecg.modules.system.service.ISysUserDepartService;
import org.jeecg.modules.system.service.ISysUserRoleService; import org.jeecg.modules.system.service.ISysUserRoleService;
import org.jeecg.modules.system.service.ISysUserService; import org.jeecg.modules.system.service.ISysUserService;
...@@ -71,9 +68,6 @@ public class SysUserController { ...@@ -71,9 +68,6 @@ public class SysUserController {
@Autowired @Autowired
private ISysUserService sysUserService; private ISysUserService sysUserService;
@Autowired
private ISysDepartService sysDepartService;
@Autowired @Autowired
private ISysUserRoleService sysUserRoleService; private ISysUserRoleService sysUserRoleService;
...@@ -96,7 +90,6 @@ public class SysUserController { ...@@ -96,7 +90,6 @@ public class SysUserController {
} }
@RequestMapping(value = "/add", method = RequestMethod.POST) @RequestMapping(value = "/add", method = RequestMethod.POST)
@RequiresPermissions("user:add")
public Result<SysUser> add(@RequestBody JSONObject jsonObject) { public Result<SysUser> add(@RequestBody JSONObject jsonObject) {
Result<SysUser> result = new Result<SysUser>(); Result<SysUser> result = new Result<SysUser>();
String selectedRoles = jsonObject.getString("selectedroles"); String selectedRoles = jsonObject.getString("selectedroles");
...@@ -119,7 +112,6 @@ public class SysUserController { ...@@ -119,7 +112,6 @@ public class SysUserController {
} }
@RequestMapping(value = "/edit", method = RequestMethod.PUT) @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@RequiresPermissions("user:edit")
public Result<SysUser> edit(@RequestBody JSONObject jsonObject) { public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
Result<SysUser> result = new Result<SysUser>(); Result<SysUser> result = new Result<SysUser>();
try { try {
...@@ -145,7 +137,6 @@ public class SysUserController { ...@@ -145,7 +137,6 @@ public class SysUserController {
/** /**
* 删除用户 * 删除用户
*/ */
@RequiresRoles({"admin"})
@RequestMapping(value = "/delete", method = RequestMethod.DELETE) @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
public Result<SysUser> delete(@RequestParam(name="id",required=true) String id) { public Result<SysUser> delete(@RequestParam(name="id",required=true) String id) {
Result<SysUser> result = new Result<SysUser>(); Result<SysUser> result = new Result<SysUser>();
...@@ -170,7 +161,6 @@ public class SysUserController { ...@@ -170,7 +161,6 @@ public class SysUserController {
/** /**
* 批量删除用户 * 批量删除用户
*/ */
@RequiresRoles({"admin"})
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
public Result<SysUser> deleteBatch(@RequestParam(name="ids",required=true) String ids) { public Result<SysUser> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
// 定义SysUserDepart实体类的数据库查询对象LambdaQueryWrapper // 定义SysUserDepart实体类的数据库查询对象LambdaQueryWrapper
...@@ -196,7 +186,6 @@ public class SysUserController { ...@@ -196,7 +186,6 @@ public class SysUserController {
* @param jsonObject * @param jsonObject
* @return * @return
*/ */
@RequiresRoles({"admin"})
@RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT) @RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT)
public Result<SysUser> frozenBatch(@RequestBody JSONObject jsonObject) { public Result<SysUser> frozenBatch(@RequestBody JSONObject jsonObject) {
Result<SysUser> result = new Result<SysUser>(); Result<SysUser> result = new Result<SysUser>();
...@@ -300,7 +289,6 @@ public class SysUserController { ...@@ -300,7 +289,6 @@ public class SysUserController {
/** /**
* 修改密码 * 修改密码
*/ */
@RequiresRoles({"admin"})
@RequestMapping(value = "/changPassword", method = RequestMethod.PUT) @RequestMapping(value = "/changPassword", method = RequestMethod.PUT)
public Result<SysUser> changPassword(@RequestBody SysUser sysUser) { public Result<SysUser> changPassword(@RequestBody SysUser sysUser) {
Result<SysUser> result = new Result<SysUser>(); Result<SysUser> result = new Result<SysUser>();
...@@ -475,7 +463,6 @@ public class SysUserController { ...@@ -475,7 +463,6 @@ public class SysUserController {
* @return * @return
*/ */
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@RequiresPermissions("user:import")
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
...@@ -528,7 +515,6 @@ public class SysUserController { ...@@ -528,7 +515,6 @@ public class SysUserController {
/** /**
* 首页密码修改 * 首页密码修改
*/ */
@RequiresRoles({"admin"})
@RequestMapping(value = "/updatePassword", method = RequestMethod.PUT) @RequestMapping(value = "/updatePassword", method = RequestMethod.PUT)
public Result<SysUser> changPassword(@RequestBody JSONObject json) { public Result<SysUser> changPassword(@RequestBody JSONObject json) {
Result<SysUser> result = new Result<SysUser>(); Result<SysUser> result = new Result<SysUser>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment