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/AuditApiServiceImpl.java

@@ -224,8 +224,8 @@ public class AuditApiServiceImpl implements AuditApiService{
 				auditMapper.updateByPrimaryKeySelective(tab);	
 				if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
 					 insertBatchLog( batchId,AuditRsultType.fail.getCode(), tab);
-					 return "0";
-				}			
+				}		
+				return "0";
 			}else{
 				//成功
 				if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){

haoban-manage3-service/src/main/resources/mapper/TabHaobanAuditMapper.xml

@@ -425,7 +425,7 @@
 			and audit_type = 3
 			and audit_status = 0
 			and enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
-			and (related_Id = #{clerkCode} or old_value like contact ('%',#{phoneNumber},'%'))
+			and (related_Id = #{clerkCode} or old_value like concat ('%',#{phoneNumber},'%'))
 	</select>
   
 </mapper>
\ No newline at end of file

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

@@ -434,7 +434,7 @@ public class WxEnterpriseController extends WebBaseController{
 		List<SecretSettingVO> listRet=EntityUtil.changeEntityListByJSON(SecretSettingVO.class,listSecret);
 		if (CollectionUtils.isNotEmpty(listRet)) {
 			listRet.forEach(secretSettingVO -> {
-				if (!StringUtils.isEmpty(secretSettingVO.getEnterpriseId())) {
+				if ((!StringUtils.isEmpty(secretSettingVO.getEnterpriseId()))&&(!secretSettingVO.getEnterpriseId().equals("-1"))) {
 					EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(secretSettingVO.getEnterpriseId());
 					secretSettingVO.setEnterpriseName(enterpriseDTO.getEnterpriseName());
 				}