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

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());
 				}