Merge branch 'master-customer-management' into dev

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

@@ -50,7 +50,7 @@ public class BaseController<Biz extends BaseBiz,Entity> extends CommonBaseContro
     @ApiOperation("修改")
     @RequestMapping(value = "/{id}",method = RequestMethod.PUT)
     @ResponseBody
-    public ObjectRestResponse<Entity> update(@RequestBody Entity entity){
+    public ObjectRestResponse<Entity> update(@RequestBody Entity entity) throws Exception {
         baseBiz.updateSelectiveById(entity);
         return new ObjectRestResponse<Entity>();
     }

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

@@ -4,8 +4,6 @@ import com.github.wxiaoqi.security.admin.biz.AppStaffUserBiz;
 import com.github.wxiaoqi.security.admin.entity.AppStaffUser;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
-import com.github.wxiaoqi.security.common.constant.RestCode;
-import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
@@ -16,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -80,4 +77,17 @@ public class AppStaffUserController extends BaseController<AppStaffUserBiz, AppS
         return ObjectRestResponse.succ();
     }
 
+    @Override
+    @ApiOperation("修改")
+    @RequestMapping(value = "/{id}",method = RequestMethod.PUT)
+    @ResponseBody
+    public ObjectRestResponse update(@RequestBody AppStaffUser appStaffUser) throws Exception {
+        AppUserDTO userDTO = (AppUserDTO) publicController.userDetailByToken(authConfig.getToken(request)).getData();
+        if (appStaffUser.getPhone().equals(userDTO.getUsername())) {
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"不能绑定本人为客户");
+        }
+        baseBiz.updateSelectiveById(appStaffUser);
+        return ObjectRestResponse.succ();
+    }
+
 }