修改用户修改表单bug

ace-common/src/main/java/com/github/wxiaoqi/security/common/rest/BaseController.java

@@ -20,9 +20,7 @@ import java.util.Map;
  * @create 2017-06-15 8:48
  */
 @Slf4j
-public class BaseController<Biz extends BaseBiz,Entity> {
-    @Autowired
-    protected HttpServletRequest request;
+public class BaseController<Biz extends BaseBiz,Entity> extends CommonBaseController{
     @Autowired
     protected Biz baseBiz;
 
@@ -67,7 +65,4 @@ public class BaseController<Biz extends BaseBiz,Entity> {
         Query query = new Query(params);
         return baseBiz.selectByQuery(query);
     }
-    public String getCurrentUserName(){
-        return BaseContextHandler.getUsername();
-    }
 }

ace-common/src/main/java/com/github/wxiaoqi/security/common/rest/CommonBaseController.java

+package com.github.wxiaoqi.security.common.rest;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.context.BaseContextHandler;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.msg.TableResultResponse;
+import com.github.wxiaoqi.security.common.util.Query;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * ${DESCRIPTION}
+ *
+ * @author wanghaobin
+ * @create 2017-06-15 8:48
+ */
+@Slf4j
+public class CommonBaseController {
+    @Autowired
+    public HttpServletRequest request;
+
+
+    public String getCurrentUserName(){
+        return BaseContextHandler.getUsername();
+    }
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/UserController.java

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.admin.entity.Menu;
 import com.github.wxiaoqi.security.admin.entity.User;
 import com.github.wxiaoqi.security.admin.rpc.service.PermissionService;
 import com.github.wxiaoqi.security.admin.vo.FrontUser;
+import com.github.wxiaoqi.security.admin.vo.GroupUsers;
 import com.github.wxiaoqi.security.admin.vo.MenuTree;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
@@ -15,6 +16,7 @@ import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.msg.TableResultResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.rest.CommonBaseController;
 import com.github.wxiaoqi.security.common.util.Query;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -37,15 +39,12 @@ import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.
 @RestController
 @RequestMapping("user")
 @Slf4j
-public class UserController{
+public class UserController extends CommonBaseController {
 
     public final static Integer CURRENT_COMPANY = 1;
     public final static Integer CURRENT_ZONE = 2;
     public final static Integer DATA_ALL = 3;
 
-    @Autowired
-    protected HttpServletRequest request;
-
     @Autowired
     private PermissionService permissionService;
 
@@ -140,6 +139,12 @@ public class UserController{
         return entityObjectRestResponse;
     }
 
+    @RequestMapping(value = "/{id}/group",method = RequestMethod.GET)
+    @ResponseBody
+    public ObjectRestResponse<GroupUsers> getGroup(@PathVariable int id){
+        return new ObjectRestResponse<GroupUsers>().rel(true).data(groupBiz.getUserGroups(id));
+    }
+
     @RequestMapping(value = "/{id}",method = RequestMethod.PUT)
     @ResponseBody
     public ObjectRestResponse<User> update(@RequestBody User entity){

ace-modules/ace-admin/src/main/resources/mapper/UserMapper.xml

@@ -16,6 +16,7 @@
     <result column="email" jdbcType="VARCHAR" property="email" />
     <result column="sex" jdbcType="CHAR" property="sex" />
     <result column="type" jdbcType="CHAR" property="type" />
+    <result column="status" jdbcType="SMALLINT" property="status" />
     <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="crt_time" jdbcType="DATE" property="crtTime" />
     <result column="crt_user" jdbcType="VARCHAR" property="crtUser" />