Merge branch 'master' of https://github.com/java110/MicroCommunity

Api/src/main/java/com/java110/api/listener/serviceProvide/SaveServiceProvideListener.java

@@ -57,7 +57,7 @@ public class SaveServiceProvideListener extends AbstractServiceApiListener {
         JSONArray infos = reqJson.getJSONArray("data");
 
 
-        JSONObject viewServiceInfo = getObj(infos, "viewServiceInfo");
+        JSONObject viewServiceInfo = getObj(infos, "Service");
         JSONObject devServiceProvideView = getObj(infos, "devServiceProvideView");
         JSONObject serviceProvideRemarkView = getObj(infos, "serviceProvideRemarkView");
 

WebService/src/main/resources/components/serviceProvidePackage/devServiceProvide/devServiceProvide.js

@@ -77,7 +77,7 @@ vc.emit('serviceProvideRemarkView', 'onIndex', vc.component.devServiceProvideInf
 
                            vc.message('处理成功',true);
                            //关闭model
-                           vc.jumpToPage("/flow/devServiceProvideFlow?" + vc.objToGetParam(JSON.parse(json)));
+                           vc.jumpToPage("/flow/serviceProvideFlow?" + vc.objToGetParam(JSON.parse(json)));
                            return ;
                        }
                        vc.message(json);

java110-db/src/main/resources/mapper/service/ServiceServiceDaoImplMapper.xml

@@ -295,13 +295,16 @@
     </select>
 
 
-    <!-- 保存服务提供信息 add by wuxw 2018-07-03 -->
-    <insert id="saveServiceProvideInfo" parameterType="Map">
+    <!-- 保存服务提供信息 add by wuxw 2018-07-03
         insert into c_service_sql(
-        service_code,name,params,query_model,sql,proc,java_script,template,remark
+        service_code,name,params,query_model,"sql",proc,java_script,template,remark
         ) values (
         #{serviceCode},#{name},#{params},#{queryModel},#{sql},#{proc},#{javaScript},#{template},#{remark}
         )
+     -->
+    <insert id="saveServiceProvideInfo" parameterType="Map">
+        insert into c_service_sql
+            select null,#{serviceCode},#{name},#{params},#{queryModel},#{sql},#{proc},#{javaScript},#{template},#{remark},now(),'0'
     </insert>
 
 
@@ -357,7 +360,7 @@
             , t.query_model= #{queryModel}
         </if>
         <if test="sql !=null and sql != ''">
-            , t.sql= #{sql}
+            , t.`sql`= #{sql}
         </if>
         <if test="proc !=null and proc != ''">
             , t.proc= #{proc}