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

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

@@ -67,9 +67,9 @@ public class EnterpriseController extends WebBaseController{
 				if(CollectionUtil.isNotEmpty(wxEnterpriseIdDTOs)){
 					wxEnterpriseIds = wxEnterpriseIdDTOs.stream().map(s->s.getWxEnterpriseId()).collect(Collectors.toList());
 				}
-				if(CollectionUtil.isEmpty(wxEnterpriseIds)){
-					wxEnterpriseIds = Arrays.asList("-9999");
-				}
+			}
+			if(CollectionUtil.isEmpty(wxEnterpriseIds)){
+				wxEnterpriseIds = Arrays.asList("-9999");
 			}
 		}
 		Page<YwWxEnterpriseDTO> page = wxEnterpriseApiService.list(pageInfo,keyword,wxEnterpriseIds,gicContactHelper,version);

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

@@ -117,14 +117,10 @@
   </update>
   <update id="saveSetting" parameterType="com.gic.haoban.manage.service.entity.TabHaobanApplicationSetting" >
     update tab_haoban_application_setting
-    <set >
+    set update_time = NOW(),
       <if test="openFlag != null" >
-        open_flag = #{openFlag,jdbcType=INTEGER},
-      </if>
-      <if test="updateTime != null" >
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
+        open_flag = #{openFlag,jdbcType=INTEGER}
       </if>
-    </set>
     where  wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
     		and application_id = #{applicationId,jdbcType=VARCHAR}
     		and status_flag = 1