* 代码优化

src/main/java/com/huiju/estateagents/base/BaseController.java

@@ -96,6 +96,36 @@ public class BaseController {
         return null;
     }
 
+    /**
+     * 获取服务管理后台用户ID
+     *
+     * @param request
+     * @return
+     */
+    public Integer getSysUserId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("userId")) {
+            return Integer.valueOf(map.get("userId").toString());
+        }
+        return null;
+    }
+
+    /**
+     * 获取服务管理后台用户ID
+     *
+     * @param request
+     * @return
+     */
+    public String getSysUserName(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("userName")) {
+            return map.get("userName") + "";
+        }
+        return null;
+    }
+
     public List<TaPersonBuilding> getTaPersonBuildingListByUserId(HttpServletRequest request) {
         TaUser taUser = taUserService.getById(getUserId(request));
         if (taUser == null) {

src/main/java/com/huiju/estateagents/center/sysUser/entity/SysUser.java

@@ -26,7 +26,9 @@ public class SysUser implements Serializable {
     /**
      * 账户登录
      */
-    @TableId(value = "user_name")
+    @TableId(value = "user_id")
+    private Integer userId;
+
     private String userName;
 
     /**

src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java

@@ -111,7 +111,11 @@ public class SysUserChannelController extends BaseController {
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
         }
 
-        String token = JWTUtils.newToken(sysUser.getUserName());
+        Map map = new HashMap();
+        map.put("userName", sysUser.getUserName());
+        map.put("userId",sysUser.getUserId());
+
+        String token = JWTUtils.newTokenByMap(map);
 
         //保存token
         sysTokenService.saveToken(token);
@@ -138,7 +142,7 @@ public class SysUserChannelController extends BaseController {
      */
     @RequestMapping(value="/channel/current",method=RequestMethod.GET)
     public ResponseBean currentChannelUser(HttpServletRequest request){
-        String userName = JWTUtils.getSubject(request);
+        String userName = getSysUserName(request);
         QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
         sysUserQueryWrapper.eq("user_name",userName);
         sysUserQueryWrapper.eq("type",CommConstant.LOGIN_TYPE_CHANNEL);

src/main/java/com/huiju/estateagents/sample/controller/TaContactController.java

@@ -109,7 +109,7 @@ public class TaContactController extends BaseController {
     public ResponseBean batchDelete(@RequestBody List<TaContact> taContactList, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaContactService.batchDelete(taContactList,getUserId(request));
+            responseBean = iTaContactService.batchDelete(taContactList,getSysUserId(request));
             logger.info("TaContactController.batchDelete 返回结果：", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java

@@ -116,7 +116,7 @@ public class TaH5SampleController extends BaseController {
     public ResponseBean taH5SampleAdd(@RequestBody TaH5Sample taH5Sample, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            taH5Sample.setAddUser(getUserId(request));
+            taH5Sample.setAddUser(getSysUserId(request));
             if (iTaH5SampleService.save(taH5Sample)) {
                 responseBean.addSuccess(taH5Sample);
             } else {
@@ -167,7 +167,7 @@ public class TaH5SampleController extends BaseController {
                                          HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            taH5Sample.setUpdateUser(getUserId(request));
+            taH5Sample.setUpdateUser(getSysUserId(request));
             taH5Sample.setUpdateDate(LocalDateTime.now());
             if (iTaH5SampleService.updateById(taH5Sample)) {
                 responseBean.addSuccess(taH5Sample);
@@ -265,8 +265,8 @@ public class TaH5SampleController extends BaseController {
         try {
             List<String> tags = taH5Sample.getTags();
             taH5Sample.setTag(String.join(",", tags));
-            taH5Sample.setAddUser(getUserId(request));
-            taH5Sample.setUpdateUser(getUserId(request));
+            taH5Sample.setAddUser(getSysUserId(request));
+            taH5Sample.setUpdateUser(getSysUserId(request));
             taH5Sample.setCreateDate(LocalDateTime.now());
             taH5Sample.setUpdateDate(LocalDateTime.now());
             if (iTaH5SampleService.save(taH5Sample)) {
@@ -341,7 +341,7 @@ public class TaH5SampleController extends BaseController {
             QueryWrapper<TaSampleContact> taSampleContactQueryWrapper = new QueryWrapper<>();
             taSampleContactQueryWrapper.eq("sample_id", id);
             iTaSampleContactService.remove(taSampleContactQueryWrapper);
-            taH5Sample.setUpdateUser(getUserId(request));
+            taH5Sample.setUpdateUser(getSysUserId(request));
             taH5Sample.setUpdateDate(LocalDateTime.now());
             if (iTaH5SampleService.updateById(taH5Sample)) {
                 List<TaContact> taContactList = taH5Sample.getTaContactList();
@@ -382,7 +382,7 @@ public class TaH5SampleController extends BaseController {
                 return ResponseBean.error("存在关联的需求单，删除失败！", ResponseBean.ERROR_UNAVAILABLE);
             }
             TaH5Sample taH5Sample = iTaH5SampleService.getById(id);
-            taH5Sample.setUpdateUser(getUserId(request));
+            taH5Sample.setUpdateUser(getSysUserId(request));
             taH5Sample.setUpdateDate(LocalDateTime.now());
             taH5Sample.setStatus(CommConstant.STATUS_DELETE);
             if (iTaH5SampleService.updateById(taH5Sample)) {

src/main/resources/mapper/sample/TaH5SampleMapper.xml

@@ -9,8 +9,8 @@
             t3.user_name updateUserName
         FROM
             ta_h5_sample t
-            LEFT JOIN ta_user t2 ON t.add_user = t2.user_id
-            LEFT JOIN ta_user t3 ON t.update_user = t3.user_id
+            LEFT JOIN sys_user t2 ON t.add_user = t2.user_id
+            LEFT JOIN sys_user t3 ON t.update_user = t3.user_id
         WHERE
             t.`status` = 1
             <if test = "sampleName != null and sampleName != ''">