From 53c8d3e3bd3596132b362f20e52aef380d493a84 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 31 三月 2024 21:12:01 +0800
Subject: [PATCH] system fix 1

---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/BasCoderuleServiceImpl.java |  261 ++++++++++++---------------------------------------
 1 files changed, 62 insertions(+), 199 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/BasCoderuleServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/BasCoderuleServiceImpl.java
index bde8027..d23a951 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/BasCoderuleServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/BasCoderuleServiceImpl.java
@@ -1,36 +1,30 @@
 package com.qianwen.smartman.modules.system.service.impl;
 
-import cn.hutool.core.annotation.AnnotationUtil;
-import cn.hutool.core.date.DateField;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.ImmutableMap;
-import java.lang.invoke.SerializedLambda;
 import java.lang.reflect.Field;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.DictCache;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.constant.CommonConstant;
-import com.qianwen.smartman.common.constant.ExtCacheConstant;
-import com.qianwen.smartman.common.utils.ExtraLambdaQueryWrapper;
-import com.qianwen.smartman.common.utils.Lambda;
-import com.qianwen.smartman.common.utils.MessageUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.ImmutableMap;
 import com.qianwen.core.cache.utils.CacheUtil;
 import com.qianwen.core.coderule.annotation.CodeRule;
 import com.qianwen.core.log.exception.ServiceException;
 import com.qianwen.core.mp.base.BaseServiceImpl;
 import com.qianwen.core.tool.utils.BeanUtil;
 import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.cache.DictCache;
+import com.qianwen.smartman.common.constant.CommonConstant;
+import com.qianwen.smartman.common.constant.ExtCacheConstant;
+import com.qianwen.smartman.common.utils.Lambda;
+import com.qianwen.smartman.common.utils.MessageUtils;
 import com.qianwen.smartman.modules.cps.vo.ConfigVO;
 import com.qianwen.smartman.modules.system.convert.BasCoderuleConvert;
 import com.qianwen.smartman.modules.system.dto.BasCoderuleDTO;
@@ -44,8 +38,13 @@
 import com.qianwen.smartman.modules.system.service.IBasCoderuleService;
 import com.qianwen.smartman.modules.system.service.IMetaObjectTypeFieldService;
 import com.qianwen.smartman.modules.system.service.IMetaObjectTypeService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+
+import cn.hutool.core.annotation.AnnotationUtil;
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.util.StrUtil;
 
 @Service
 /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/service/impl/BasCoderuleServiceImpl.class */
@@ -57,174 +56,6 @@
     private final CodeHistoryMapper codeHistoryMapper;
     private final ConfigVO configVO;
 
-    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
-        String implMethodName = lambda.getImplMethodName();
-        boolean z = true;
-        switch (implMethodName.hashCode()) {
-            case -2126571984:
-                if (implMethodName.equals("getObjectId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -1839024804:
-                if (implMethodName.equals("getSystemDefault")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -1249363733:
-                if (implMethodName.equals("getFId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -464233508:
-                if (implMethodName.equals("getBillFormId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 7171409:
-                if (implMethodName.equals("getEnumType")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 58947841:
-                if (implMethodName.equals("getRuleFieldDictKey")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case 98245393:
-                if (implMethodName.equals("getId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 776139821:
-                if (implMethodName.equals("getRuleId")) {
-                    z = true;
-                    break;
-                }
-                break;
-        }
-        switch (z) {
-            case false:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getRuleFieldDictKey();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getRuleFieldDictKey();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getRuleFieldDictKey();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getRuleFieldDictKey();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/MetaObjectType") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getFId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getBillFormId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getBillFormId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getBillFormId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getBillFormId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/MetaObjectTypeField") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getEnumType();
-                    };
-                }
-                break;
-            case RegionCache.VILLAGE_LEVEL /* 5 */:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
-                    return (v0) -> {
-                        return v0.getSystemDefault();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
-                    return (v0) -> {
-                        return v0.getSystemDefault();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
-                    return (v0) -> {
-                        return v0.getSystemDefault();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/BasCodeRule") && lambda.getImplMethodSignature().equals("()Ljava/lang/Boolean;")) {
-                    return (v0) -> {
-                        return v0.getSystemDefault();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/BasCodeRuleEntry") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRuleId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/BasCodeRuleEntry") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRuleId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/BasCodeRuleEntry") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getRuleId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/MetaObjectTypeField") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getObjectId();
-                    };
-                }
-                break;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
 
     public BasCoderuleServiceImpl(final IBasCoderuleEntryService basCoderuleEntryService, final IMetaObjectTypeService metaObjectTypeService, final IMetaObjectTypeFieldService metaObjectTypeFieldService, final CodeHistoryMapper codeHistoryMapper, final ConfigVO configVO) {
         this.basCoderuleEntryService = basCoderuleEntryService;
@@ -238,9 +69,11 @@
     public BasCoderuleDTO getCoderuleDetails(Long coderuleId) {
         BasCoderuleDTO result = BasCoderuleConvert.INSTANCE.convertToDTO((BasCodeRule) getById(coderuleId));
         if (Func.isNotEmpty(result)) {
+        	result.setEntryList(this.basCoderuleEntryService.list(Wrappers.<BasCodeRuleEntry>lambdaQuery().eq(BasCodeRuleEntry::getRuleId, coderuleId))); 
+        	/*
             result.setEntryList(this.basCoderuleEntryService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
                 return v0.getRuleId();
-            }, coderuleId)));
+            }, coderuleId)));*/
         }
         return result;
     }
@@ -259,9 +92,11 @@
             }
             saveOrUpdate(basCoderule);
             List<BasCodeRuleEntry> entryList = basCoderuleDTO.getEntryList();
+            this.basCoderuleEntryService.remove(Wrappers.<BasCodeRuleEntry>lambdaQuery().eq(BasCodeRuleEntry::getRuleId, basCoderule.getId()));
+            /*
             this.basCoderuleEntryService.remove((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
                 return v0.getRuleId();
-            }, basCoderule.getId()));
+            }, basCoderule.getId()));*/
             if (Func.isNotEmpty(entryList)) {
                 entryList.forEach(x -> {
                     x.setRuleId(basCoderule.getId());
@@ -277,19 +112,23 @@
     @Transactional(rollbackFor = {Exception.class})
     public Boolean deleteCoderule(List<Long> ids) {
         deleteLogic(ids);
+        this.basCoderuleEntryService.remove(Wrappers.<BasCodeRuleEntry>lambdaQuery().in(BasCodeRuleEntry::getRuleId, ids));
+        /*
         this.basCoderuleEntryService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
             return v0.getRuleId();
-        }, ids));
+        }, ids));*/
         return true;
     }
 
     @Override // org.springblade.modules.system.service.IBasCoderuleService
     public boolean isExistCodeRule(String billFormId) {
+    	return (count(Lambda.eq(BasCodeRule::getBillFormId, billFormId).eq(BasCodeRule::getSystemDefault, Boolean.valueOf(true))) != 0L);
+    	/*
         return count((Wrapper) Lambda.eq((v0) -> {
             return v0.getBillFormId();
         }, billFormId).eq((v0) -> {
             return v0.getSystemDefault();
-        }, true)) != 0;
+        }, true)) != 0;*/
     }
 
     public String getAnnotationFieldValue(Object data, String dbField) {
@@ -307,8 +146,11 @@
                     i++;
                 } else {
                     fields[i].setAccessible(true);
-                    fieldValue = fields[i].get(data);
-                    break;
+                    try {
+						fieldValue = fields[i].get(data);
+					} catch (IllegalArgumentException | IllegalAccessException e) {
+						log.error("璁剧疆瀛楁鏁版嵁閿欒",e);
+					} 
                 }
             }
         }
@@ -347,13 +189,18 @@
     }
 
     private BasCodeRule getDefaultRuleByObjectType(String objectTypeId) {
+    	BasCodeRule basCodeRule = getOne(
+    	        Lambda.eq(BasCodeRule::getBillFormId, objectTypeId)
+    	        .eq(BasCodeRule::getSystemDefault, Boolean.TRUE)
+    	        .isNull(BasCodeRule::getRuleFieldDictKey), false);
+    	/*
         BasCodeRule basCodeRule = (BasCodeRule) getOne((Wrapper) ((ExtraLambdaQueryWrapper) Lambda.eq((v0) -> {
             return v0.getBillFormId();
         }, objectTypeId).eq((v0) -> {
             return v0.getSystemDefault();
         }, Boolean.TRUE)).isNull((v0) -> {
             return v0.getRuleFieldDictKey();
-        }), false);
+        }), false);*/
         return basCodeRule;
     }
 
@@ -361,13 +208,19 @@
         if (dictKey == null) {
             return getDefaultRuleByObjectType(objectTypeId);
         }
+        
+        BasCodeRule basCodeRule = (BasCodeRule)getOne(
+                Lambda.eq(BasCodeRule::getBillFormId, objectTypeId)
+                .eq(BasCodeRule::getSystemDefault, Boolean.valueOf(true))
+                .eq(BasCodeRule::getRuleFieldDictKey, dictKey));
+        /*
         BasCodeRule basCodeRule = (BasCodeRule) getOne((Wrapper) ((ExtraLambdaQueryWrapper) Lambda.eq((v0) -> {
             return v0.getBillFormId();
         }, objectTypeId).eq((v0) -> {
             return v0.getSystemDefault();
         }, true)).eq((v0) -> {
             return v0.getRuleFieldDictKey();
-        }, dictKey));
+        }, dictKey));*/
         if (basCodeRule == null) {
             return getDefaultRuleByObjectType(objectTypeId);
         }
@@ -375,6 +228,13 @@
     }
 
     private int getDefaultCount(BasCodeRule basCodeRule) {
+    	long existCount = count(
+    	        Lambda.eq(BasCodeRule::getBillFormId, basCodeRule.getBillFormId())
+    	        .eq(Func.isNotEmpty(basCodeRule.getRuleFieldDictKey()), BasCodeRule::getRuleFieldDictKey, basCodeRule.getRuleFieldDictKey())
+    	        .isNull(Func.isNull(basCodeRule.getRuleFieldDictKey()), BasCodeRule::getRuleFieldDictKey)
+    	        .ne(BasCodeRule::getId, basCodeRule.getId())
+    	        .eq(BasCodeRule::getSystemDefault, true));
+    	/*
         long existCount = count((Wrapper) ((ExtraLambdaQueryWrapper) Lambda.eq((v0) -> {
             return v0.getBillFormId();
         }, basCodeRule.getBillFormId()).eq(Func.isNotEmpty(basCodeRule.getRuleFieldDictKey()), (v0) -> {
@@ -385,7 +245,7 @@
             return v0.getId();
         }, basCodeRule.getId())).eq((v0) -> {
             return v0.getSystemDefault();
-        }, true));
+        }, true));*/
         return Func.toInt(Long.valueOf(existCount));
     }
 
@@ -411,11 +271,14 @@
             throw new ServiceException(MessageUtils.message("system.metaobjet.not.found", new Object[0]) + billFormId);
         }
         if (Func.isNotEmpty(metaObjectType.getRuleField())) {
+        	 MetaObjectTypeField field = this.metaObjectTypeFieldService.getOne(Lambda.eq(MetaObjectTypeField::getEnumType, metaObjectType.getRuleDictCode())
+        	          .eq(MetaObjectTypeField::getObjectId, billFormId).limit(1));
+        	 /*
             MetaObjectTypeField field = (MetaObjectTypeField) this.metaObjectTypeFieldService.getOne(((ExtraLambdaQueryWrapper) Lambda.eq((v0) -> {
                 return v0.getEnumType();
             }, metaObjectType.getRuleDictCode()).eq((v0) -> {
                 return v0.getObjectId();
-            }, billFormId)).limit(1));
+            }, billFormId)).limit(1));*/
             rule = (BasCodeRule) Optional.ofNullable(data.get(field.getField())).map(item -> {
                 return (BasCodeRule) Optional.ofNullable(getDictRuleByObjectType(billFormId, item.toString())).orElseThrow(() -> {
                     return new IllegalArgumentException(JSONObject.toJSONString(ImmutableMap.of(CommonConstant.ALARM_MSG, String.format(MessageUtils.message("system.coderule.rule.not.found", new Object[0]), field.getFName(), data.get(field.getField())), "data", field.getField())));
@@ -433,7 +296,7 @@
         }).orElseThrow(() -> {
             return new ServiceException(MessageUtils.message("system.coderule.not.found", new Object[0]));
         })).booleanValue()) {
-            return (List) Optional.ofNullable(metaObjectType.getCode()).map(item2 -> {
+            return Optional.ofNullable(metaObjectType.getCode()).map(item2 -> {
                 return this.codeHistoryMapper.getPatchCodeList(billFormId, metaObjectType.getTableName(), item2, offset, endTime);
             }).orElseThrow(() -> {
                 return new ServiceException(MessageUtils.message("system.coderule.code.not.set", new Object[0]));

--
Gitblit v1.9.3