Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.java

@@ -167,7 +167,6 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
 
             InputStream inputStream = new ByteArrayInputStream(sw.toString().getBytes(Constant.UTF8));
             MultipartFile file = getMultipartFile(inputStream, "file.css");
-            // MultipartFile file = new MockMultipartFile("file.css", "file.css", ContentType.APPLICATION_OCTET_STREAM.toString(), inputStream);
             String filePath = uploadService.saveFileUpload(file, "file/fileupload", context.getUser());
             entity.setCssFilePath(filePath);
 

base-manager/src/main/resources/sqlmap/module/matter/MatterMapperExt.xml

@@ -20,7 +20,7 @@
                     and a.deptCode = #{condition.deptCode,jdbcType=VARCHAR}
                 </if>
                 <if test="condition.matterName != null and condition.matterName != ''">
-                    a.matterName like #{condition.matterName}
+                    and a.matterName like #{condition.matterName}
                 </if>
             </trim>
         </trim>
@@ -43,7 +43,7 @@
                     and a.deptCode = #{condition.deptCode,jdbcType=VARCHAR}
                 </if>
                 <if test="condition.matterName != null and condition.matterName != ''">
-                     a.matterName like #{condition.matterName}
+                     and a.matterName like #{condition.matterName}
                 </if>
             </trim>
         </trim>

base-manager/src/test/java/com/mortals/httpclient/matter/MatterController.http

@@ -30,6 +30,7 @@ POST {{baseUrl}}/matter/sublist
 Content-Type: application/json
 
 {
+
   "siteId": 5,
   "page": 1,
   "size": 10

smart-gateway/src/main/resources/bootstrap.yml

@@ -46,8 +46,6 @@ spring:
           uri: lb://base-manager
           predicates:
             - Path=/base/**
-    #              filters:
-    #                - StripPrefix=1
           metadata:
             response-timeout: 200000
             connect-timeout: 200000
@@ -69,6 +67,15 @@ spring:
           uri: lb://log-manager
           predicates:
             - Path=/logservice/**
+        # 填单服务
+        - id: fill-manager
+          #uri: http://192.168.0.98:17001
+          uri: lb://fill-manager
+          predicates:
+            - Path=/fm/**
+          metadata:
+            response-timeout: 200000
+            connect-timeout: 200000
         # 样表服务服务
         - id: sample-form-manager
           #uri: http://192.168.0.98:17002