Merge branch 'master-customer-management' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppStaffUserBiz.java

@@ -83,4 +83,10 @@ public class AppStaffUserBiz extends BaseBiz<AppStaffUserMapper, AppStaffUser> {
         List<AppStaffUser> appStaffUsers = mapper.selectByExample(example);
         return CollectionUtil.isEmpty(appStaffUsers)?true:false;
     }
+
+    public void update(AppStaffUser staffUser, Integer userid) {
+        Example example = new Example(AppStaffUser.class);
+        example.createCriteria().andEqualTo("id",staffUser.getId()).andEqualTo("suId",userid);
+        mapper.updateByExampleSelective(staffUser,example);
+    }
 }

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

@@ -4,6 +4,8 @@ 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.auth.client.jwt.UserAuthUtil;
+import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
@@ -29,6 +31,7 @@ public class AppStaffUserController extends BaseController<AppStaffUserBiz, AppS
     private final HttpServletRequest request;
     private final PublicController publicController;
     private final String POSITION_NAME="员工";
+    private final UserAuthUtil userAuthUtil;
 
     /**
      * 获取该用户所用的客户
@@ -39,7 +42,7 @@ public class AppStaffUserController extends BaseController<AppStaffUserBiz, AppS
     public  ObjectRestResponse<List<AppStaffUser>> getAll() throws Exception {
         AppUserDTO userDTO = (AppUserDTO) publicController.userDetailByToken(authConfig.getToken(request)).getData();
         if (POSITION_NAME.equals(userDTO.getPositionName())) {
-         return ObjectRestResponse.succ(baseBiz.getAll(userDTO.getUserid())) ;
+            return ObjectRestResponse.succ(baseBiz.getAll(userDTO.getUserid())) ;
         }
      return ObjectRestResponse.succ();
     }
@@ -48,11 +51,11 @@ public class AppStaffUserController extends BaseController<AppStaffUserBiz, AppS
     @ApiOperation("添加")
     @PostMapping(value = "")
     public ObjectRestResponse<AppStaffUser> add(@RequestBody AppStaffUser appStaffUser) throws Exception {
-        AppUserDTO userDTO = (AppUserDTO) publicController.userDetailByToken(authConfig.getToken(request)).getData();
-        if (appStaffUser.getPhone().equals(userDTO.getUsername())) {
+        IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(authConfig.getToken(request));
+        if (appStaffUser.getPhone().equals(infoFromToken.getUniqueName())) {
            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"不能绑定本人为客户");
         }
-        appStaffUser.setSuId(userDTO.getUserid());
+        appStaffUser.setSuId(Integer.valueOf(infoFromToken.getId()));
         if (baseBiz.select(appStaffUser)) {
             baseBiz.insertSelective(appStaffUser);
             return  ObjectRestResponse.succ();
@@ -65,7 +68,6 @@ public class AppStaffUserController extends BaseController<AppStaffUserBiz, AppS
     @GetMapping(value = "one")
     public ObjectRestResponse<AppStaffUser> findOne(AppStaffUser appStaffUser)  {
         AppStaffUser staffUser = baseBiz.findOne(appStaffUser);
-
         if (staffUser!=null) {
             return ObjectRestResponse.succ(staffUser);
         }
@@ -74,11 +76,13 @@ public class AppStaffUserController extends BaseController<AppStaffUserBiz, AppS
 
     @ApiOperation("删除")
     @DeleteMapping(value = "delete/{id}")
-    public ObjectRestResponse<AppStaffUser> delete(@PathVariable Integer id)  {
+    public ObjectRestResponse<AppStaffUser> delete(@PathVariable Integer id) throws Exception {
+        IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(authConfig.getToken(request));
+        String userid = infoFromToken.getId();
         AppStaffUser staffUser = new AppStaffUser();
         staffUser.setId(id);
         staffUser.setIsDel(1);
-        baseBiz.updateSelectiveById(staffUser);
+        baseBiz.update(staffUser,Integer.valueOf(userid));
         return ObjectRestResponse.succ();
     }
 
@@ -87,10 +91,11 @@ public class AppStaffUserController extends BaseController<AppStaffUserBiz, AppS
     @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())) {
+        IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(authConfig.getToken(request));
+        if (appStaffUser.getPhone().equals(infoFromToken.getUniqueName())) {
             return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"不能绑定本人为客户");
         }
+        appStaffUser.setSuId(Integer.valueOf(infoFromToken.getId()));
         if (baseBiz.select(appStaffUser)) {
             baseBiz.updateSelectiveById(appStaffUser);
             return ObjectRestResponse.succ();