From 0e877574ab499260677ab81c2c0298eb25fe4fd0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 13 五月 2024 16:19:23 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/AutoGenerateIdInterceptor.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/AutoGenerateIdInterceptor.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/AutoGenerateIdInterceptor.java
index 960f6d0..6265e27 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/AutoGenerateIdInterceptor.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/AutoGenerateIdInterceptor.java
@@ -44,10 +44,10 @@
Class<?> entityClass = entity.getClass();
Method setMt = null ;
try{
- // 鍒ゆ柇涓婚敭鏄痠d杩樻槸userId
+ // 娣诲姞鐢ㄦ埛鏃秛serId涓鸿嚜鍔ㄧ敓鎴愪富閿�俽oleId瀛樺湪鏃舵槸涓虹敤鎴风粦瑙掕壊
String jsonString = JSONObject.toJSONString(entity, JSONWriter.Feature.WriteMapNullValue);
JSONObject jsonObject = JSONObject.parseObject(jsonString);
- if(jsonObject.containsKey("userId")) {
+ if(jsonObject.containsKey("userId") && !jsonObject.containsKey("roleId")) {
setMt = entityClass.getMethod(BASE_FIELD_SET_PRIMARY_KEY_FUNTION_NAME2, Long.class) ;
}else {
//鏈変竴浜涘疄浣撴病鏈塱d锛屼緥濡備腑闂磋〃
--
Gitblit v1.8.0