c-zhouhf1/zhgh_cug
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
c-zhouhf1
2026-07-14 16:28:22 +08:00
parent 24e2d9e826
commit f39735f1f2
37 changed files with 468 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/staffbenefit/medicalMutualAid/aidFund/controller/AidFundChangeRecordController.java
+7 -1
View File
@@ -91,7 +91,13 @@ public class AidFundChangeRecordController {
$condition
""");
Cnd cnd = Cnd.NEW();
cnd.andEX("us.aidFundMemberUserType", "=", pageForm.getAidFundMemberUserType());
if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
SqlExpressionGroup seg = new SqlExpressionGroup();
seg.or("us.loginname", "like", "%" + pageForm.getSearchKeyword() + "%");
seg.or("us.username", "like", "%" + pageForm.getSearchKeyword() + "%");
cnd.and(seg);
}
cnd.andEX("IFNULL(info.aidFundMemberUserType, us.aidFundMemberUserType)", "=", pageForm.getAidFundMemberUserType());
cnd.andEX("us.unitid", "=", pageForm.getUnitId());
cnd.andEX("us.unionid", "=", pageForm.getUnionId());
cnd.andEX("info.changeType", "=", pageForm.getChangeType());