From d370c5b1f2c33f8599db7ece89b484613b594f60 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 15 九月 2023 08:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
index 52d55bb..1e4f607 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
@@ -25,6 +25,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -240,12 +241,16 @@
 
 	/**
 	 * 闆嗗洟/浼佷笟鐮佹鍒ゆ柇
-	 * @param parameter 浼犲叆鏁版嵁 ,classifyGroupCode:閰嶇疆鐨勪腑鐨勫垎绫婚《鑺傜偣锛宱id锛氶�夋嫨鑺傜偣鐨刼id--锛宯owApplyCode锛氬綋鍓嶇敵璇风紪鐮佺殑鍒嗙被
+	 * @param classifyGroupCode 浼犲叆鏁版嵁 ,classifyGroupCode:閰嶇疆鐨勪腑鐨勫垎绫婚《鑺傜偣
+	 * @param oid 浼犲叆鏁版嵁 ,閫夋嫨鑺傜偣鐨刼id--锛宯owApplyCode锛氬綋鍓嶇敵璇风紪鐮佺殑鍒嗙被
 	 * @return 鎵ц缁撴灉
 	 */
 	@GetMapping("/checkGroupCode")
 	@VciBusinessLog(operateName = "闆嗗洟/浼佷笟鐮佹鍒ゆ柇")
-	public R checkGroupCode(Map<String,String> parameter) throws Exception {
-		return R.data(mdmEngineService.checkGroupCode(parameter));
+	public R checkGroupCode(String oid,String  classifyGroupCode) throws Exception {
+		Map<String,String> codtionMap=new HashMap<>();
+		codtionMap.put("oid",oid);
+		codtionMap.put("classifyGroupCode",classifyGroupCode);
+		return mdmEngineService.checkGroupCode(codtionMap);
 	}
 }

--
Gitblit v1.9.3