diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/whiteuser/api/WhiteUserApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/whiteuser/api/WhiteUserApi.java index bc2d9745..1a1a240e 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/whiteuser/api/WhiteUserApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/whiteuser/api/WhiteUserApi.java @@ -33,7 +33,7 @@ public class WhiteUserApi extends ApiBaseController { * */ @PostMapping("/save") public JsonResponse save(@RequestBody WhiteUser whiteUser){ - if(StringUtil.isBlank(whiteUser.getUserNo())){ + if(StringUtil.isBlank(whiteUser.getCode())){ return badRequest("参数异常"); } if(StringUtil.isBlank(whiteUser.getName())){ @@ -52,7 +52,7 @@ public class WhiteUserApi extends ApiBaseController { * */ @PostMapping("/update") public JsonResponse update(@RequestBody WhiteUser whiteUser){ - if(StringUtil.isBlank(whiteUser.getUserNo())){ + if(StringUtil.isBlank(whiteUser.getCode())){ return badRequest("参数异常"); } if(StringUtil.isBlank(whiteUser.getName())){ diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/whiteuser/entity/WhiteUser.java b/servers/boe-server-all/src/main/java/com/xboe/system/whiteuser/entity/WhiteUser.java index 71ea6f76..e937521b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/whiteuser/entity/WhiteUser.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/whiteuser/entity/WhiteUser.java @@ -16,10 +16,16 @@ import javax.persistence.Table; public class WhiteUser extends IdEntity { - @Column(name = "user_no",length = 30) - private String userNo; + @Column(name = "code",length = 30) + private String code; @Column(name = "name",length = 30) private String name; + /** + * 环境 + * */ + @Column(name="environment") + private Integer environment; + } diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/whiteuser/service/impl/WhiteUserServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/system/whiteuser/service/impl/WhiteUserServiceImpl.java index 1c7c25e2..6acc71f1 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/whiteuser/service/impl/WhiteUserServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/whiteuser/service/impl/WhiteUserServiceImpl.java @@ -25,12 +25,15 @@ public class WhiteUserServiceImpl implements IWhiteUserService { public List list(WhiteUser whiteUser) { QueryBuilder builder = QueryBuilder.from(WhiteUser.class); if(whiteUser!=null){ - if(StringUtil.isNotBlank(whiteUser.getUserNo())){ - builder.addFilter(FieldFilters.eq("userNo",whiteUser.getUserNo())); + if(StringUtil.isNotBlank(whiteUser.getCode())){ + builder.addFilter(FieldFilters.eq("code",whiteUser.getCode())); } if(StringUtil.isNotBlank(whiteUser.getName())){ builder.addFilter(FieldFilters.like("name", LikeMatchMode.ANYWHERE,whiteUser.getName())); } + if(whiteUser.getEnvironment()!=null){ + builder.addFilter(FieldFilters.eq("environment",whiteUser.getEnvironment())); + } } builder.addOrder(OrderCondition.desc("id")); List list = whiteUserDao.findList(builder.builder());