自定义列查询不到该用户则新增再返回

module_kzks/src/main/java/org/jeecg/modules/customColumns/controller/CustomColumnsController.java

@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
  * @Date:   2023-08-14
  * @Version: V1.0
  */
-@Api(tags="自定义列记录表")
+@Api(tags="...自定义列记录表")
 @RestController
 @RequestMapping("/customColumns/customColumns")
 @Slf4j
@@ -50,18 +50,23 @@ public class CustomColumnsController extends JeecgController<CustomColumns, ICus
 		 LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		 String userName=user.getUsername();// 登录账号
 
-		 CustomColumns customColumns = new CustomColumns();
-		 customColumns.setUserName(userName);
-		 customColumns.setCustomLocation("1");//TODO 暂时只有一个项目成本需要自定义列，如果以后有多个再改
+		 //TODO 暂时只有一个项目成本需要自定义列，如果以后有多个再改
 
-		 Wrapper<CustomColumns> queryWrapper = new QueryWrapper<>(customColumns);
-		 CustomColumns customColumns1 = customColumnsService.getOne(queryWrapper);
+		 CustomColumns customColumns1 = customColumnsService.selectByUserName(userName);
 
 		 String checkedValues;
 		 String[] checkedValue = new String[0];
 		 if(customColumns1!=null){
 			 checkedValues = customColumns1.getCheckedValues();
 			 checkedValue = checkedValues.split(",");
+		 }else {
+			 CustomColumns customColumns2 = new CustomColumns();
+			 customColumns2.setUserName(userName);
+			 customColumnsService.save(customColumns2);
+
+			 customColumns2 = customColumnsService.selectByUserName(userName);
+			 checkedValues = customColumns2.getCheckedValues();
+			 checkedValue = checkedValues.split(",");
 		 }
 		 return checkedValue;
 	 }

module_kzks/src/main/java/org/jeecg/modules/customColumns/entity/CustomColumns.java

@@ -1,22 +1,19 @@
 package org.jeecg.modules.customColumns.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 
 /**
  * @Description: 自定义列记录表
@@ -33,8 +30,9 @@ public class CustomColumns implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
-    private java.lang.Integer id;
+    private java.lang.String id;
 	/**登录账号*/
 	@Excel(name = "登录账号", width = 15)
     @ApiModelProperty(value = "登录账号")