wms / wms_wuhangelinmei · Commits

Commit f9226c2d0c8d3e0614d7806fc3db3177e0e17b31

Authored by pengcheng
2 parents cb1f8309 a2bbd4f1

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 2 changed files with 24 additions and 2 deletions
src/main/java/com/huaheng/pc/system/user/controller/UserController.java
  View file @f9226c2
... ... @@ -269,5 +269,27 @@ public class UserController extends BaseController
269 269 return toAjax(flag);
270 270 }
271 271  
  272 + /**
  273 + * 解绑回收人
  274 + */
  275 + @PostMapping("/unBindRecover/{id}")
  276 + @ResponseBody
  277 + public AjaxResult unBindRecover(@PathVariable("id") Integer id)
  278 + {
  279 + boolean flag = false;
  280 + if (StringUtils.isNotNull(id))
  281 + {
  282 + User user = userService.selectUserById(id);
  283 + user.setIsRecover(0);
  284 + int updateUser = userService.updateUser(user);
  285 + if(updateUser > 0){
  286 + flag =true;
  287 + }
  288 + }else{
  289 + return AjaxResult.error("【"+id+"】该用户不存在。");
  290 + }
  291 + return toAjax(flag);
  292 + }
  293 +
272 294  
273 295 }
... ...
src/main/resources/templates/system/user/user.html
  View file @f9226c2
... ... @@ -192,7 +192,7 @@
192 192 actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a> ');
193 193 actions.push('<a class="btn btn-info btn-xs ' + resetPwdFlag + '" href="#" onclick="resetPwd(\'' + row.id + '\')"><i class="fa fa-key"></i>修改密码</a>');
194 194 actions.push('<a class="btn btn-danger btn-xs ' + resetPwdFlag + '" href="#" onclick="bindRecover(\'' + row.id + '\')"><i class="fa fa-lock"></i>绑定回收人</a>');
195   - actions.push('<a class="btn btn-primary btn-xs ' + resetPwdFlag + '" href="#" onclick="bindRecover(\'' + row.id + '\')"><i class="fa fa-unlock"></i>绑定回收人</a>');
  195 + actions.push('<a class="btn btn-primary btn-xs ' + resetPwdFlag + '" href="#" onclick="unRecover(\'' + row.id + '\')"><i class="fa fa-unlock"></i>绑定回收人</a>');
196 196 return actions.join('');
197 197 }
198 198 }]
... ... @@ -272,7 +272,7 @@
272 272 }
273 273  
274 274 function unRecover(id) {
275   - var url = prefix + '/bindRecover/' + id;
  275 + var url = prefix + '/unBindRecover/' + id;
276 276 var config = {
277 277 url: url,
278 278 type: "post",
... ...