zhouweidong 发布系统代码 [ibz-ou，统一组织单位]

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysDeptMember.java

@@ -167,22 +167,6 @@ public class SysDeptMember extends EntityMP implements Serializable {
     }
 
 
-    /**
-     * 获取 [标识]
-     */
-    public String getMemberid() {
-        if(ObjectUtils.isEmpty(memberid)) {
-            memberid=(String)getDefaultKey(true);
-        }
-        return memberid;
-    }
-
-    @Override
-    public Serializable getDefaultKey(boolean gen) {
-        if((!ObjectUtils.isEmpty(this.getDeptid()))&&(!ObjectUtils.isEmpty(this.getUserid())))
-            return DigestUtils.md5DigestAsHex(String.format("%s||%s" ,this.getDeptid(),this.getUserid()).getBytes());
-        return null;
-    }
     /**
      * 复制当前对象数据到目标对象(粘贴重置)
      * @param targetEntity 目标数据对象

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/SysDeptMemberServiceImpl.java

@@ -82,7 +82,7 @@ public class SysDeptMemberServiceImpl extends ServiceImpl<SysDeptMemberMapper, S
     @Transactional
     public void createBatch(List<SysDeptMember> list) {
         list.forEach(item->fillParentData(item));
-        this.saveOrUpdateBatch(list,batchSize);
+        this.saveBatch(list, batchSize);
     }
 
     @Override

ibzou-core/src/main/java/cn/ibizlab/core/util/config/RocketMQProducer.java

@@ -14,7 +14,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 
 @Slf4j
 @Configuration
-@ConditionalOnExpression("${rocketmq.producer.isOnOff:'off'}.equals('on')")
+@ConditionalOnExpression("'${rocketmq.producer.isOnOff:off}'.equals('on')")
 public class RocketMQProducer {
 
     @Value("${rocketmq.producer.groupName:default}")

ibzou-core/src/main/resources/sysmodel/ibzou.json

@@ -342,7 +342,6 @@
     "data_type":"VARCHAR",
     "data_length":100,
     "key_field":0,
-    "union_key":"KEY1",
     "show_order":2,
     "major_field":0
     },
@@ -379,7 +378,6 @@
     "data_type":"VARCHAR",
     "data_length":100,
     "key_field":0,
-    "union_key":"KEY2",
     "show_order":4,
     "major_field":0
     },

ibzou-util/src/main/java/cn/ibizlab/util/aspect/RocketMQAspect.java

@@ -30,7 +30,7 @@ import java.util.List;
 @Slf4j
 @Aspect
 @Component
-@ConditionalOnExpression("${rocketmq.producer.isOnOff:'off'}.equals('on')")
+@ConditionalOnExpression("'${rocketmq.producer.isOnOff:off}'.equals('on')")
 public class RocketMQAspect
 {
     private final ExpressionParser parser = new SpelExpressionParser();