wms / wms4_tuopusi · Commits

Commit 6e1d704f0913b796bb41a7068896169fd2f26d75

Authored by zhangdaihao
1 parent ab302c4d

V2.0 版本权限测试代码去掉，简化使用难度 

1.解决SqlServer、oracle，demo表少sys_org_code字段
2.解决用户操作无权限问题，去掉权限注解
3.解决用户列表，无编辑按钮问题，去掉前端权限指令
Inline Side-by-side
Showing 2 changed files with 2 additions and 16 deletions
ant-design-jeecg-vue/src/views/system/UserList.vue
  View file @6e1d704
... ... @@ -118,9 +118,9 @@
118 118 </template>
119 119  
120 120 <span slot="action" slot-scope="text, record">
121   - <a @click="handleEdit(record)" v-has="'user:edit'">编辑</a>
  121 + <a @click="handleEdit(record)">编辑</a>
122 122  
123   - <a-divider type="vertical" v-has="'user:edit'"/>
  123 + <a-divider type="vertical"/>
124 124  
125 125 <a-dropdown>
126 126 <a class="ant-dropdown-link">
... ...
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  View file @6e1d704
... ... @@ -13,8 +13,6 @@ import java.util.UUID;
13 13 import javax.servlet.http.HttpServletRequest;
14 14 import javax.servlet.http.HttpServletResponse;
15 15  
16   -import org.apache.shiro.authz.annotation.RequiresPermissions;
17   -import org.apache.shiro.authz.annotation.RequiresRoles;
18 16 import org.jeecg.common.api.vo.Result;
19 17 import org.jeecg.common.system.query.QueryGenerator;
20 18 import org.jeecg.common.util.PasswordUtil;
... ... @@ -24,7 +22,6 @@ import org.jeecg.modules.system.entity.SysUserDepart;
24 22 import org.jeecg.modules.system.entity.SysUserRole;
25 23 import org.jeecg.modules.system.model.DepartIdModel;
26 24 import org.jeecg.modules.system.model.SysUserDepartsVO;
27   -import org.jeecg.modules.system.service.ISysDepartService;
28 25 import org.jeecg.modules.system.service.ISysUserDepartService;
29 26 import org.jeecg.modules.system.service.ISysUserRoleService;
30 27 import org.jeecg.modules.system.service.ISysUserService;
... ... @@ -71,9 +68,6 @@ public class SysUserController {
71 68 @Autowired
72 69 private ISysUserService sysUserService;
73 70  
74   - @Autowired
75   - private ISysDepartService sysDepartService;
76   -
77 71 @Autowired
78 72 private ISysUserRoleService sysUserRoleService;
79 73  
... ... @@ -96,7 +90,6 @@ public class SysUserController {
96 90 }
97 91  
98 92 @RequestMapping(value = "/add", method = RequestMethod.POST)
99   - @RequiresPermissions("user:add")
100 93 public Result<SysUser> add(@RequestBody JSONObject jsonObject) {
101 94 Result<SysUser> result = new Result<SysUser>();
102 95 String selectedRoles = jsonObject.getString("selectedroles");
... ... @@ -119,7 +112,6 @@ public class SysUserController {
119 112 }
120 113  
121 114 @RequestMapping(value = "/edit", method = RequestMethod.PUT)
122   - @RequiresPermissions("user:edit")
123 115 public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
124 116 Result<SysUser> result = new Result<SysUser>();
125 117 try {
... ... @@ -145,7 +137,6 @@ public class SysUserController {
145 137 /**
146 138 * 删除用户
147 139 */
148   - @RequiresRoles({"admin"})
149 140 @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
150 141 public Result<SysUser> delete(@RequestParam(name="id",required=true) String id) {
151 142 Result<SysUser> result = new Result<SysUser>();
... ... @@ -170,7 +161,6 @@ public class SysUserController {
170 161 /**
171 162 * 批量删除用户
172 163 */
173   - @RequiresRoles({"admin"})
174 164 @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
175 165 public Result<SysUser> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
176 166 // 定义SysUserDepart实体类的数据库查询对象LambdaQueryWrapper
... ... @@ -196,7 +186,6 @@ public class SysUserController {
196 186 * @param jsonObject
197 187 * @return
198 188 */
199   - @RequiresRoles({"admin"})
200 189 @RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT)
201 190 public Result<SysUser> frozenBatch(@RequestBody JSONObject jsonObject) {
202 191 Result<SysUser> result = new Result<SysUser>();
... ... @@ -300,7 +289,6 @@ public class SysUserController {
300 289 /**
301 290 * 修改密码
302 291 */
303   - @RequiresRoles({"admin"})
304 292 @RequestMapping(value = "/changPassword", method = RequestMethod.PUT)
305 293 public Result<SysUser> changPassword(@RequestBody SysUser sysUser) {
306 294 Result<SysUser> result = new Result<SysUser>();
... ... @@ -475,7 +463,6 @@ public class SysUserController {
475 463 * @return
476 464 */
477 465 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
478   - @RequiresPermissions("user:import")
479 466 public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
480 467 MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
481 468 Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
... ... @@ -528,7 +515,6 @@ public class SysUserController {
528 515 /**
529 516 * 首页密码修改
530 517 */
531   - @RequiresRoles({"admin"})
532 518 @RequestMapping(value = "/updatePassword", method = RequestMethod.PUT)
533 519 public Result<SysUser> changPassword(@RequestBody JSONObject json) {
534 520 Result<SysUser> result = new Result<SysUser>();
... ...