21

src/main/java/com/fdkankan/manage/controller/IncrementTypeController.java

@@ -26,10 +26,14 @@ public class IncrementTypeController {
 
     @Autowired
     IIncrementTypeService incrementTypeService;
+    @Value("${environment:cn}")
+    private String environment;
 
     @GetMapping("/allList")
     public ResultData list(){
-        return ResultData.ok(incrementTypeService.list());
+        LambdaQueryWrapper<IncrementType> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IncrementType::getType,environment);
+        return ResultData.ok(incrementTypeService.list(wrapper));
     }
 }
 

src/main/java/com/fdkankan/manage/controller/SysRoleController.java

@@ -7,6 +7,7 @@ import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.manage.entity.SysRole;
 import com.fdkankan.manage.service.ISysRoleService;
+import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.manage.vo.request.SysRoleMenuParam;
 import com.fdkankan.manage.vo.request.SysRoleParam;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/fdkankan/manage/entity/IncrementType.java

@@ -81,17 +81,17 @@ public class IncrementType implements Serializable {
     private String symbol;
 
     @TableField("rec_status")
-    @TableLogic
+    @TableLogic(value = "A",delval = "I")
     private String recStatus;
 
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
     /**
      * 权益价格
      */
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
 
 }