Merge remote-tracking branch 'origin/master'

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

@@ -12,10 +12,8 @@ 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;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
-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;
@@ -24,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -66,14 +63,22 @@ public class UserController extends CommonBaseController {
     //内部类
 
     @Data
-    public static class AddUserDTO extends User {
+    public static class UserVO extends User {
         List<Integer> dataLimit;
         List<Integer> members;
     }
 
     @RequestMapping(value = "",method = RequestMethod.POST)
     @IgnoreClientToken
-    public ObjectRestResponse<User> add(@RequestBody AddUserDTO dto){
+    public ObjectRestResponse<User> add(@RequestBody UserVO vo){
+        handleDataLimit(vo);
+        userBiz.insertSelective(vo);
+        //添加权限关系
+        groupBiz.modifyUserGroups(vo.getId(), vo.getMembers());
+        return new ObjectRestResponse();
+    }
+
+    private void handleDataLimit(@RequestBody UserVO dto) {
         if(null != dto.getDataLimit()) {
             if(dto.getDataLimit().contains(CURRENT_COMPANY)) {
                 dto.setDataCompany(dto.getCompanyId().toString());
@@ -85,10 +90,6 @@ public class UserController extends CommonBaseController {
                 dto.setDataAll(DATA_ALL_TRUE);
             }
         }
-        userBiz.insertSelective(dto);
-        //添加权限关系
-        groupBiz.modifyUserGroups(dto.getId(), dto.getMembers());
-        return new ObjectRestResponse();
     }
 
     @RequestMapping(value = "/front/info", method = RequestMethod.GET)
@@ -145,8 +146,11 @@ public class UserController extends CommonBaseController {
 
     @RequestMapping(value = "/{id}",method = RequestMethod.PUT)
     @ResponseBody
-    public ObjectRestResponse<User> update(@RequestBody User entity){
-        userBiz.updateSelectiveById(entity);
+    public ObjectRestResponse<User> update(@RequestBody UserVO vo){
+        handleDataLimit(vo);
+        userBiz.updateSelectiveById(vo);
+        //添加权限关系
+        groupBiz.modifyUserGroups(vo.getId(), vo.getMembers());
         return new ObjectRestResponse<User>();
     }
     @RequestMapping(value = "/{id}",method = RequestMethod.DELETE)