laizhilong 发布系统代码

app_web/src/components/app-quick-group/app-quick-group.vue

@@ -65,6 +65,7 @@ export default class AppQuickGroup extends Vue {
      */
     get renderArray(){
       if(this.items && this.items.length >0){
+        this.selectedUiItem = this.items[0];
         this.handleClick(this.items[0]);
         return this.handleDataSet(this.items)
       }else{
@@ -144,9 +145,6 @@ export default class AppQuickGroup extends Vue {
      * @memberof AppQuickGroup
      */
     public handleClick($event:any,isswitch:boolean = true){
-      if(this.selectedUiItem && (this.selectedUiItem.id === $event.id)){
-        return;
-      }
       this.$emit('valuechange',$event);
       if(isswitch){
         this.selectedUiItem = $event;

app_web/src/engine/view/wfdyna-exp-grid-view-engine.ts

@@ -49,7 +49,6 @@ export default class WFDynaExpGridViewEngine extends GridViewEngine {
     public onCtrlEvent(ctrlName: string, eventName: string, args: any): void {
         if (Object.is(ctrlName, 'grid')) {
             this.GridEvent(eventName, args);
-            return;
         }
         super.onCtrlEvent(ctrlName, eventName, args);
     }

app_web/src/widgets/sys-open-access/main-form/main-form-base.vue

@@ -116,8 +116,8 @@
 		:data="data"
 		formitemname="lic"
 		:value="data.lic"
-		folder='ibizutil'
-		ownertype='sys_open_access'
+		folder='sysopenaccess'
+		ownertype='lic'
 		:ownerid="data.srfkey"
 		:show-ocrview=true
 		:show-preview=true

ibzuaa-util/src/main/java/cn/ibizlab/util/aspect/VersionCheckAspect.java

@@ -18,6 +18,9 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import java.lang.reflect.Field;
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -109,7 +112,8 @@ public class VersionCheckAspect
      */
     @SneakyThrows
     private Object getDBVersion(VersionCheck versionCheck,Object service,Object id){
-        Object dbVersion=null;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Timestamp dbVersion=null;
         String versionField=versionCheck.versionfield();
         if(!ObjectUtils.isEmpty(service)){
             EvaluationContext oldContext = new StandardEvaluationContext();
@@ -117,7 +121,12 @@ public class VersionCheckAspect
             oldContext.setVariable("id",id);
             Expression oldExp = parser.parseExpression("#service.get(#id)");
             EntityBase oldEntity =oldExp.getValue(oldContext, EntityBase.class);
-            return oldEntity.get(versionField);
+            Object oldDate=oldEntity.get(versionField);
+            if(oldDate!=null && oldDate instanceof Timestamp){
+                Timestamp db_time= (Timestamp) oldDate;
+                Date db_date = sdf.parse(sdf.format(db_time));
+                dbVersion=new Timestamp(db_date.getTime());
+            }
         }
         return dbVersion;
     }