fanxw преди 2 години
родител
ревизия
a74b7d0902

+ 2 - 1
src/main/java/com/chinaitop/depot/system/controller/OrgInfoController.java

@@ -325,7 +325,8 @@ public class OrgInfoController {
325 325
 		}
326 326
 	}
327 327
 
328
-	@RequestMapping("/updateWjl")
328
+	@RequestMapping(value="/updateWjl", method = RequestMethod.GET)
329
+	@ApiOperation(value="把没有生成文件流的数据生成文件流", notes = "")
329 330
 	public Map<String, Object> updateWjl() {
330 331
 		Map<String, Object> modelMap = new HashMap<>();
331 332
 		OrgInfoExample example = new OrgInfoExample();

+ 2 - 1
src/main/java/com/chinaitop/depot/system/service/impl/DataDockingServiceImpl.java

@@ -113,7 +113,7 @@ public class DataDockingServiceImpl implements DataDockingService {
113 113
     	}
114 114
 
115 115
     	//单位类型dwlx
116
-    	String dwlx = obj.getString("dwlx");
116
+    	String dwlx = obj.getString("kqlb");
117 117
     	if (StringUtils.isNotBlank(dwlx)) {
118 118
     		String id = this.getBasicEnum(319, dwlx.trim(), "1");
119 119
     		if (StringUtils.isNotBlank(id)) {
@@ -333,6 +333,7 @@ public class DataDockingServiceImpl implements DataDockingService {
333 333
 					BasicEnum e = resultList.get(i);
334 334
 					if (e.getGbcode().equals(gbcode)) {
335 335
 						id = e.getEnumid().toString();
336
+						break;
336 337
 					}
337 338
 				}
338 339
 			}