Merge remote-tracking branch 'origin/master'

src/main/java/com/tykj/workflowcore/base/aop/EntityHandle.java

+package com.tykj.workflowcore.base.aop;
+
+import com.tykj.workflowcore.base.entity.BaseEntity;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+import static java.util.Objects.isNull;
+
+/**
+ * @author C
+ */
+@Aspect
+@Component
+public class EntityHandle {
+
+    @Before("execution(* org.springframework.data.repository.CrudRepository.save(..)) && args(com.tykj.workflowcore.base.entity.BaseEntity))")
+    public void checkTimes(JoinPoint point) {
+        Object[] args = point.getArgs();
+        for (Object arg : args) {
+            BaseEntity entity = (BaseEntity) arg;
+            if (isNull(entity.getCreatedTime())){
+                entity.setCreatedTime(new Date());
+            }
+            entity.setUpdatedTime(new Date());
+        }
+    }
+
+}

src/main/java/com/tykj/workflowcore/model_layer/utils/HqlUtil.java

@@ -11,14 +11,18 @@ import java.util.Objects;
 public class HqlUtil {
 
     public static String createQuery(String tableName, List<QueryCondition> conditions) {
-        StringBuilder result = new StringBuilder("select * from table ");
-        result.append(tableName);
+        StringBuilder result = new StringBuilder("select entity from ");
+        result.append(tableName).append(" entity ");
         if (Objects.nonNull(conditions) && !conditions.isEmpty()) {
             result.append(" where ");
             for (QueryCondition condition : conditions) {
-                result.append(condition.getName()).append(condition.getType()).append(condition.getValue()).append(" AND ");
+                result.append("entity.")
+                        .append(condition.getName())
+                        .append(condition.getType())
+                        .append(condition.getValue())
+                        .append(" and ");
             }
-            result.delete(result.lastIndexOf(" AND "), result.length());
+            result.delete(result.lastIndexOf(" and "), result.length());
         }
         return result.toString();
     }