diff --git a/src/main/java/com/example/demo/mapper/DetailYMapper.java b/src/main/java/com/example/demo/mapper/DetailYMapper.java index d3354c6..defb362 100644 --- a/src/main/java/com/example/demo/mapper/DetailYMapper.java +++ b/src/main/java/com/example/demo/mapper/DetailYMapper.java @@ -70,6 +70,7 @@ public interface DetailYMapper { "and update_type=#{updateType}", "AND detail_y.create_time BETWEEN #{startDate} AND #{endDate}", "and consume_platform=#{consumePlatform}", + "and area=#{area}", "", "ORDER BY detaily_id desc", "" diff --git a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java index 1310486..3d6320c 100644 --- a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java @@ -26,9 +26,11 @@ public class UserServiceImpl implements UserSevice { @Override public UserVo search(UserVo userVo) throws Exception{ User sUser = userMapper.select(userVo.getJwcode()); + if(ObjectUtils.isEmpty(sUser)){ throw new Exception("无此精网号"); } +// if(sUser.getArea()!=) return userMapper.selectA(userVo); } @Override