Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/ApplicationController.java

@@ -158,7 +158,7 @@ public class ApplicationController extends WebBaseController {
                 return resultResponse(HaoBanErrCode.ERR_1, true);
             }
             if (enterpriseDTO.getContactFlag() != null && enterpriseDTO.getContactFlag() == 0) {
-                String taskId = dealSyncOperationApiService.createQywxTask(wxEnterpriseId, "同步企业微信架构", login.getStaffId(), "首次同步企业微信架构");
+                String taskId = dealSyncOperationApiService.createQywxTask(wxEnterpriseId, "同步企业微信架构", login.getClerkId(), "首次同步企业微信架构");
                 if (StringUtils.isBlank(taskId)) {
                     log.info("【是否绑定】taskId={}", taskId);
                     return resultResponse(HaoBanErrCode.ERR_1, true);
@@ -191,7 +191,7 @@ public class ApplicationController extends WebBaseController {
                 return resultResponse(HaoBanErrCode.ERR_1, false);
             }
             if (StringUtils.isNotBlank(secretSetting.getSecretVal()) && enterpriseDTO.getContactFlag() != null) {
-                String taskId = dealSyncOperationApiService.createQywxTask(wxEnterpriseId, "后门同步企业微信架构", login.getStaffId(), "后门同步企业微信架构");
+                String taskId = dealSyncOperationApiService.createQywxTask(wxEnterpriseId, "后门同步企业微信架构", login.getClerkId(), "后门同步企业微信架构");
                 if (StringUtils.isBlank(taskId)) {
                     return resultResponse(HaoBanErrCode.ERR_1, false);
                 }
@@ -288,7 +288,7 @@ public class ApplicationController extends WebBaseController {
         String wxEnterpriseId = login.getWxEnterpriseId();
         WxEnterpriseDTO enterpriseDTO = this.wxEnterpriseApiService.getOne(wxEnterpriseId);
         if (enterpriseDTO != null) {
-            String taskId = dealSyncOperationApiService.createQywxTask(wxEnterpriseId, "后门同步企业微信架构", login.getStaffId(), "后门同步企业微信架构");
+            String taskId = dealSyncOperationApiService.createQywxTask(wxEnterpriseId, "后门同步企业微信架构", login.getClerkId(), "后门同步企业微信架构");
             if (StringUtils.isBlank(taskId)) {
                 return resultResponse(HaoBanErrCode.ERR_0, false);
             }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/MaterialController.java

@@ -124,8 +124,8 @@ public class MaterialController extends WebBaseController {
         String wxEnterpriseId = login.getWxEnterpriseId();
         materialDTO.setWxEnterpriseId(wxEnterpriseId);
 
-        materialDTO.setStaffId(login.getStaffId());
-        materialDTO.setStaffName(null);
+        materialDTO.setStaffId(login.getClerkId());
+        materialDTO.setStaffName(login.getClerkName());
         String materialTitle = materialDTO.getMaterialTitle();
         String categoryId = materialDTO.getCategoryId();
         Integer categoryType = materialDTO.getMaterialType();
@@ -153,7 +153,7 @@ public class MaterialController extends WebBaseController {
         BatchAddMaterialDTO.Material material = dto.getMaterial();
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         material.setWxEnterpriseId(login.getWxEnterpriseId());
-        material.setStaffId(login.getStaffId());
+        material.setStaffId(login.getClerkId());
         material.setStaffName(null);
         if (StringUtils.isAnyBlank(material.getCategoryId(), material.getMaterialTitle())
                 || Objects.isNull(material.getMaterialType())) {
@@ -182,8 +182,8 @@ public class MaterialController extends WebBaseController {
     @RequestMapping("/material-edit")
     public HaobanResponse materialEdit(MaterialDTO materialDTO) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        materialDTO.setStaffId(login.getStaffId());
-        materialDTO.setStaffName(null);
+        materialDTO.setStaffId(login.getClerkId());
+        materialDTO.setStaffName(login.getClerkName());
         String materialId = materialDTO.getMaterialId();
         MaterialDTO dto = materialApiService.selectMaterialById(materialId);
         if (dto == null) {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -340,12 +340,11 @@ public class StaffController extends WebBaseController {
      */
     @RequestMapping("del-clerk-relation")
     public HaobanResponse delStaffClerkList(String staffId, String clerkId) {
-        WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         StaffDTO staff = staffApiService.selectById(staffId);
         if (staff == null) {
             return resultResponse(HaoBanErrCode.ERR_10007);
         }
-        boolean b = staffClerkRelationApiService.unbindByStaffAndClerkId(login.getStaffId(), clerkId);
+        boolean b = staffClerkRelationApiService.unbindByStaffAndClerkId(staffId, clerkId);
         return resultResponse(HaoBanErrCode.ERR_1, b);
     }
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/SyncDealContoller.java

@@ -48,7 +48,7 @@ public class SyncDealContoller extends WebBaseController {
             if (RedisUtil.getCache(key) != null) {
                 return resultResponse(HaoBanErrCode.ERR_10011);
             }
-            task = dealSyncOperationApiService.createTask(wxEnterpriseId, "门店同步", login.getStaffId(), "部门同步");
+            task = dealSyncOperationApiService.createTask(wxEnterpriseId, "门店同步", login.getClerkId(), "部门同步");
             dealSyncOperationApiService.dealDepartment(task, login.getWxEnterpriseId(), qo.getAddDepartment(), qo.getEditDepartment());
         }
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -561,7 +561,7 @@ public class WxEnterpriseController extends WebBaseController {
         if (monthCount >= 3) {
             return resultResponse(HaoBanErrCode.ERR_100020);
         }
-        String taskId = dealSyncOperationApiService.createWxFriendTask(wxEnterpriseId, "刷新企微好友", login.getStaffId(), "刷新企微好友");
+        String taskId = dealSyncOperationApiService.createWxFriendTask(wxEnterpriseId, "刷新企微好友", login.getClerkId(), "刷新企微好友");
         if (StringUtils.isEmpty(taskId)) {
             return resultResponse(HaoBanErrCode.ERR_100021);
         }
@@ -628,7 +628,7 @@ public class WxEnterpriseController extends WebBaseController {
     public HaobanResponse flushBindStoreList(String enterpriseId) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
-        ServiceResponse response = wxEnterpriseRelatedApiService.flushBindStoreByEnterpriseId(enterpriseId, wxEnterpriseId, login.getStaffId(), ChannelCodeEnum.SYNC_UNBIND.getCode());
+        ServiceResponse response = wxEnterpriseRelatedApiService.flushBindStoreByEnterpriseId(enterpriseId, wxEnterpriseId, login.getClerkId(), ChannelCodeEnum.SYNC_UNBIND.getCode());
         logger.info("返回信息：{}", JSONObject.toJSONString(response));
         if (response.getCode() != 1) {
             HaoBanErrCode.ERR_DEFINE.setMsg(response.getMessage());

haoban-manage3-web/src/main/webapp/WEB-INF/spring-interceptor.xml

@@ -5,7 +5,7 @@
     <mvc:interceptors>
         <bean class="com.gic.haoban.common.interceptor.HttpLimitInterceptor"/>
         <bean class="com.gic.commons.interceptor.HeaderTagInterceptor"/>
-        <bean class="com.gic.web.common.inteceptor.RequestInteceptor"></bean>
+        <bean class="com.gic.web.common.inteceptor.RequestInteceptor"/>
         <mvc:interceptor>
             <mvc:mapping path="/**"/>
             <mvc:exclude-mapping path="/login.json"/>