Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -117,6 +117,10 @@ public class ApplicationTemplateApiServiceImpl implements ApplicationTemplateApi
 		for (String wxEnterpriseId : wxEnterpriseIdArr) {
 			TemplateEnterpriseRelatedDTO dto = templateEnterpriseRelatedService.selectByWxEnterpriseId(wxEnterpriseId);
 			if(dto != null){
+				if(!dto.getApplicationTemplateId().equals(applicationTemplateId)){
+					dto.setApplicationTemplateId(applicationTemplateId);
+					templateEnterpriseRelatedService.update(dto);
+				}
 				continue;
 			}
 			dto = new TemplateEnterpriseRelatedDTO();

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

@@ -355,7 +355,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 		staff.setPostion(user.getPosition());
 		staff.setExtendPostion(user.getExternal_position());
 		//成员更改或更新
-		if(staff == null) {
+		if(StringUtils.isBlank(staff.getStaffId())) {
 			logger.info("新增成员");
 			staff.setActiveFlag(0);
 			staff.setCreateTime(new Date());