Merge branch 'CH-0402-CW打印' of sckj/mz-cloud into master

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/enums/SysUserTypeStatus.java

@@ -6,6 +6,7 @@ package com.ruoyi.system.api.enums;
 public enum SysUserTypeStatus {
     SYS("00", "系统用户"), YLJG("01", "养老机构用户"), SQYLJG("02", "社区养老服务机构用户"), SQST("05", "社区食堂用户"),
     PDZJ("11","评定专家用户"), SYSCX("03", "系统查询用户"), LNSTYG("04", "老年食堂员工"),
+    GLJTQX("22","高龄津贴区县用户"), GLJTJD("21", "高龄津贴街道用户"), GLJTSQ("20", "高龄津贴社区用户"),
     LRZZLR("07", "老年食堂就餐老人");
 
     private final String code;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysCwxxTbServiceImpl.java

@@ -85,6 +85,20 @@ public class SysCwxxTbServiceImpl implements ISysCwxxTbService
         String code = StringUtils.isEmpty(sysCwxxTb.getDwszdxzqhdm()) ? SecurityUtils.getAreaCode().substring(0,6) : sysCwxxTb.getDwszdxzqhdm().substring(0,6);
 
         LambdaQueryWrapper<SysCwxxTb> queryWrapper = new LambdaQueryWrapper<>(sysCwxxTb);
+        queryWrapper.isNotNull(SysCwxxTb::getDjsj);
+        queryWrapper.isNotNull(SysCwxxTb::getDjbm);
+        queryWrapper.isNotNull(SysCwxxTb::getTyxydm);
+        queryWrapper.isNotNull(SysCwxxTb::getDwmc);
+        queryWrapper.isNotNull(SysCwxxTb::getFddbr);
+        queryWrapper.isNotNull(SysCwxxTb::getDz);
+        queryWrapper.isNotNull(SysCwxxTb::getDwszdxzqhdm);
+        queryWrapper.isNotNull(SysCwxxTb::getDh);
+        queryWrapper.isNotNull(SysCwxxTb::getJglx);
+        queryWrapper.isNotNull(SysCwxxTb::getLx);
+        queryWrapper.isNotNull(SysCwxxTb::getXz);
+        queryWrapper.isNotNull(SysCwxxTb::getXbzt);
+        queryWrapper.isNotNull(SysCwxxTb::getNmzgrs);
+        queryWrapper.isNotNull(SysCwxxTb::getNmzyzrs);
         if("1".equals(sysCwxxTb.getIsBj())){
         queryWrapper.eq(SysCwxxTb::getDwszdxzqhdm, code);
         }else{