Browse Source

修复表单更新操作失败的bug

William 2 years ago
parent
commit
5bd9829925

+ 3 - 3
src/main/java/org/springblade/flow/datalog/enums/FormDataLogType.java

@@ -8,11 +8,11 @@ package org.springblade.flow.datalog.enums;
  */
 public enum FormDataLogType {
 
-	add("phone", "新增"),
+	add("add", "新增"),
 
-	remove("url", "删除"),
+	remove("remove", "删除"),
 
-	update("cpname", "更新");
+	update("update", "更新");
 
 	private String action;
 	private String name;

+ 2 - 0
src/main/java/org/springblade/flow/datalog/model/FormDataLog.java

@@ -30,6 +30,8 @@ public class FormDataLog implements Serializable {
 	private String action;// 操作:add-新增;delete-删除;update-修改;
 	private Date time; // 操作时间
 	private Long sn; // 序列号,同一次的操作序列号相同
+	private String operator;
+	private Long operatorId;
 
 	public FormDataLog() {
 		this(null);

+ 3 - 0
src/main/java/org/springblade/flow/datalog/service/FormDataLogService.java

@@ -9,6 +9,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.springblade.bi.client.model.CubeTableColumnModel;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.cube.enums.ViewColumnTypeEnum;
 import org.springblade.flow.datalog.enums.FormDataLogType;
 import org.springblade.flow.datalog.mapper.FormDataLogMapper;
@@ -116,6 +117,8 @@ public class FormDataLogService extends ServiceImpl<FormDataLogMapper, FormDataL
 			// 同一批次的数据变更,时间和批号都相同
 			log.setTime(new Date());
 			log.setSn(sn);
+			log.setOperator(SecureUtil.getUserName());
+			log.setOperatorId(SecureUtil.getUserId());
 			logList.add(log);
 		}
 

+ 1 - 1
src/main/java/org/springblade/flow/util/JsonUtil.java

@@ -52,7 +52,7 @@ public class JsonUtil {
     public static Map<String, Object> stringToMap(String object){
         Map<String,Object> map = null;
         try {
-        	JSONObject.parseObject(object, new TypeReference<Map<String, Object>>(){});
+        	map = JSONObject.parseObject(object, new TypeReference<Map<String, Object>>(){});
 		} catch (Exception e) {
 		}
         return  map;

+ 1 - 1
src/main/java/org/springblade/flow/visual/onlinedev/common/formdata/FormDataWithTableService.java

@@ -664,7 +664,7 @@ public class FormDataWithTableService {
 		if (primaryColumn == null) {
 			return ActionResult.fail("更新失败,该表不存在主键,表名是:" + mainTable);
 		}
-
+		
 		Map<String, Object> formDataMap = JsonUtil.stringToMap(visualdevModelDataUpForm.getData());
 		List<UpdateBean> updateList = new ArrayList<>();
 		DsType dsType = DsType.reslove(ds.getDsType());