111

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

@@ -93,8 +93,10 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         String staffId = staffClerkRelation.getStaffId();
         String wxEnterpriseId = staffClerkRelation.getWxEnterpriseId();
         TabHaobanClerkMainStoreRelated r = clerkMainStoreRelatedService.selectByWxEnterpriseIdAndStoreId(staffId, wxEnterpriseId);
-        r.setStatusFlag(0);
-        clerkMainStoreRelatedService.update(r);
+        if(r != null){
+            r.setStatusFlag(0);
+            clerkMainStoreRelatedService.update(r);
+        }
         externalClerkRelatedService.delByClerkIdAndStaffId(staffClerkRelation.getClerkId(), staffId);
         List<StaffClerkRelationDTO> list = this.lisByStaffId(wxEnterpriseId, staffId);
         if (list != null && list.size() >= 1) {

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

@@ -102,7 +102,9 @@ public class WxEnterpriseController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_1);
 		}
 		WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
-		
+		if(wxEnterpriseDTO == null){
+			return resultResponse(HaoBanErrCode.ERR_100018);
+		}
 		wxEnterpriseDTO.setSmallVersion("免费版");
 		wxEnterpriseDTO.setStoreTotal(departmentApiService.totalStoreCountByEnterpriseId(wxEnterpriseId));
 		return resultResponse(HaoBanErrCode.ERR_1,wxEnterpriseDTO);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -105,6 +105,7 @@ public enum HaoBanErrCode {
     
     ERR_100016(100016,"审核失败"),
     ERR_100017(100017,"secret已经设置过"),
+    ERR_100018(100018,"企业不存在"),
 
     ERR_DEFINE(-888, "自定义错误"),
     ERR_OTHER(-999, "未知错误code");

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

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,6 +33,7 @@ import com.gic.haoban.manage.api.service.AuditApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
+import com.gic.haoban.manage.web.anno.HttpLimit;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.AuditVO;
 
@@ -180,6 +182,7 @@ public class AuditController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1,vo);
 	}
 	//审核，1同意，2拒绝，3取消审核
+	@HttpLimit
 	@RequestMapping("clerk-audit")
 	public HaobanResponse clerkAudit(String auditId,String auditReason,Integer auditStatus,String wxEnterpriseId,String staffId){
 		if(StringUtils.isAnyBlank(auditId,wxEnterpriseId)){

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

@@ -476,6 +476,7 @@ public class ClerkController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1,clerkStoreList);
 	}
 	//绑定
+	@HttpLimit
 	@RequestMapping("bind-staff")
 	public HaobanResponse bindStaff(String clerkId,String staffId ,Integer auditType){
 		if(StringUtils.isAnyBlank(clerkId,staffId)){