yzc 1 gadu atpakaļ
vecāks
revīzija
83db1f5cbd

+ 7 - 0
hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountSubjectsServiceImpl.java

@@ -10,6 +10,7 @@ import com.fjhx.account.entity.account.vo.AccountSubjectsVo;
 import com.fjhx.account.mapper.account.AccountSubjectsMapper;
 import com.fjhx.account.service.account.AccountSubjectsService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -28,6 +29,9 @@ public class AccountSubjectsServiceImpl extends ServiceImpl<AccountSubjectsMappe
     @Override
     public List<AccountSubjectsVo> getList(AccountSubjectsSelectDto dto) {
         IWrapper<AccountSubjects> wrapper = getWrapper();
+
+        wrapper.keyword(dto.getKeyword(), new SqlField("asu.subjects_name"), new SqlField("calculate_item_name"));
+
         wrapper.orderByDesc("asu", AccountSubjects::getId);
         List<AccountSubjectsVo> list = this.baseMapper.getList(wrapper);
         return list;
@@ -36,6 +40,9 @@ public class AccountSubjectsServiceImpl extends ServiceImpl<AccountSubjectsMappe
     @Override
     public Page<AccountSubjectsVo> getPage(AccountSubjectsSelectDto dto) {
         IWrapper<AccountSubjects> wrapper = getWrapper();
+
+        wrapper.keyword(dto.getKeyword(), new SqlField("asu.subjects_name"), new SqlField("calculate_item_name"));
+
         wrapper.orderByDesc("asu", AccountSubjects::getId);
         Page<AccountSubjectsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;