111

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

@@ -159,6 +159,9 @@ public class BindApiServiceImpl implements BindApiService {
 			if(StringUtils.isNotBlank(fromClerkCode)){
 				//发送消息
 	            ClerkDTO leader = clerkService.getClerkLeaderByStoreId(storeId);
+	            if(leader == null){
+	            	leader = new ClerkDTO();
+	            }
 	            String clerkId = leader.getClerkId();
 				String storeName = departmentDTO.getDepartmentName();
 				String staffName = clerkName;
@@ -223,6 +226,9 @@ public class BindApiServiceImpl implements BindApiService {
 			if(StringUtils.isNotBlank(sendClerkCode)){
 				//发送消息
 	            ClerkDTO leader = clerkService.getClerkLeaderByStoreId(storeId);
+	            if(leader == null){
+	            	leader = new ClerkDTO();
+	            }
 	            String clerkId = leader.getClerkId();
 				String storeName = departmentDTO.getDepartmentName();
 				String staffName = staffDTO.getStaffName();
@@ -268,6 +274,9 @@ public class BindApiServiceImpl implements BindApiService {
 		if(StringUtils.isNotBlank(fromClerkCode)){
 			//发送消息
             ClerkDTO leader = clerkService.getClerkLeaderByStoreId(storeId);
+            if(leader == null){
+            	leader = new ClerkDTO();
+            }
             String clerkId = leader.getClerkId();
 			String storeName = departmentDTO.getDepartmentName();
 			String staffName = clerkName;
@@ -330,6 +339,9 @@ public class BindApiServiceImpl implements BindApiService {
 		if(StringUtils.isNotBlank(fromClerkCode)){
 			//发送消息
             ClerkDTO leader = clerkService.getClerkLeaderByStoreId(storeId);
+            if(leader == null){
+            	leader = new ClerkDTO();
+            }
             String clerkId = leader.getClerkId();
 			String storeName = departmentDTO.getDepartmentName();
 			String staffName = clerkName;

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

@@ -305,6 +305,10 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 	@Override
 	public boolean sendSingleMessage(String clerkId, String title,
 			String content, String pageUrl) {
+		if(StringUtils.isEmpty(clerkId)){
+			logger.info("clerkId不存在============>");
+			return false;
+		}
 		Map<String,String> map = getWxUserIdByClerkId(clerkId);
 		String wxUserId = map.get("wxUserId");
 		String corpId = map.get("corpId");

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

@@ -130,6 +130,9 @@ public class ClerkController extends WebBaseController{
 		if(StringUtils.isNotBlank(oldClerkCode)){
 			//发送消息
             ClerkDTO leader = clerkService.getClerkLeaderByStoreId(storeId);
+            if(leader == null){
+            	leader = new ClerkDTO();
+            }
             String clerkId = leader.getClerkId();
 			String storeName = departmentDTO.getDepartmentName();
 			String staffName = staffDTO.getStaffName();

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

@@ -598,6 +598,10 @@ public class ClerkController extends WebBaseController{
     		jsonObject.put("storeId", clerk.getStoreId());
     		String data = jsonObject.toJSONString();
             ClerkDTO gicClerk = clerkService.getClerkLeaderByStoreId(clerk.getStoreId());
+            if(gicClerk == null){
+            	//店长不存在，直接返回
+    			return resultResponse(HaoBanErrCode.ERR_1);
+            }
     		String pageUrl = staffDepartmentRelatedApiService.getPageUrl(AppPageType.STORE_RELATED_RECORD.getCode(), data);
     		staffDepartmentRelatedApiService.sendSingleMessage(gicClerk.getClerkId(), messageTitle, messageContent, pageUrl);