Merge branch 'feature-haoban-role' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java

@@ -134,25 +134,26 @@ public class AuditApiServiceImpl implements AuditApiService {
             StaffClerkRelationDTO staffClerkRelation = staffClerkRelationApiService.getByCodeAndEnterpriseId(obj.getClerkCode(), tab.getEnterpriseId());
             String staffId = obj.getStaffId();
             String storeId = tab.getCommitStoreId();
+            String clerkId = obj.getClerkId();
             StaffClerkRelationDTO have = staffClerkRelationApiService.getOneByStoreIdAndStaffId(storeId, staffId);
+            ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
             if (have != null) {
                 tab.setAuditStatus(5);
-                Integer manageFlag = staffClerkRelation.getManageFlag();
-                String reason = "";
-                if (manageFlag != null && manageFlag == 1) {
-                    reason = "该成员在该商户下已经绑定过一个区经了";
-                } else {
-                    reason = "该成员在该门店下已经绑定过一个导购了";
+                String reason = "该成员在该门店下已经绑定过一个导购了";
+                if (clerkDTO != null) {
+                    if (clerkDTO.getClerkType() == 2) {
+                        reason = "该成员在该商户下已经绑定过一个区经了";
+                    }
                 }
                 tab.setAuditReason(reason);
                 auditMapper.updateByPrimaryKeySelective(tab);
                 if (StringUtils.isNotBlank(batchId)) {
                     insertBatchLog(batchId, AuditRsultType.fail.getCode(), tab);
                 }
-                staffDepartmentRelatedApiService.sendBindAuditMessage(auditId, obj.getStaffId(), obj.getClerkId(), tab.getAuditReason(), true);
+                staffDepartmentRelatedApiService.sendBindAuditMessage(auditId, obj.getStaffId(), clerkId, tab.getAuditReason(), true);
                 return "该成员在该门店下已经绑定过一个导购了";
             }
-            ClerkDTO clerkDTO = clerkService.getClerkByClerkId(obj.getClerkId());
+            ClerkDTO clerkDTO = clerkDTO;
             if (clerkDTO == null) {
                 tab.setAuditStatus(5);
                 tab.setAuditReason("gic已删除该导购");
@@ -160,7 +161,7 @@ public class AuditApiServiceImpl implements AuditApiService {
                 if (StringUtils.isNotBlank(batchId)) {
                     insertBatchLog(batchId, AuditRsultType.fail.getCode(), tab);
                 }
-                staffDepartmentRelatedApiService.sendBindAuditMessage(auditId, obj.getStaffId(), obj.getClerkId(), tab.getAuditReason(), true);
+                staffDepartmentRelatedApiService.sendBindAuditMessage(auditId, obj.getStaffId(), clerkId, tab.getAuditReason(), true);
                 return "gic已删除该导购";
             } else {
                 if (staffClerkRelation == null) {
@@ -168,7 +169,7 @@ public class AuditApiServiceImpl implements AuditApiService {
                 }
                 staffClerkRelation.setEnterpriseId(tab.getEnterpriseId());
                 staffClerkRelation.setClerkCode(obj.getClerkCode());
-                staffClerkRelation.setClerkId(obj.getClerkId());
+                staffClerkRelation.setClerkId(clerkId);
                 staffClerkRelation.setStoreId(tab.getCommitStoreId());
                 staffClerkRelation.setWxEnterpriseId(tab.getWxEnterpriseId());
                 staffClerkRelation.setStaffId(obj.getStaffId());
@@ -182,7 +183,7 @@ public class AuditApiServiceImpl implements AuditApiService {
                 insertBatchLog(batchId, AuditRsultType.success.getCode(), tab);
             }
             //同意绑定
-            staffDepartmentRelatedApiService.sendBindAuditMessage(auditId, obj.getStaffId(), obj.getClerkId(), "", false);
+            staffDepartmentRelatedApiService.sendBindAuditMessage(auditId, obj.getStaffId(), clerkId, "", false);
         } else if (auditType == AuditType.CLERK_ADD.getCode()) {
             //门店导购新增
             String oldValue = tab.getOldValue();