submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsRefundServiceImpl.java

@@ -714,14 +714,14 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
             vo.setGoodsNum(orderGoodsRefundVos.size());
             BeanUtil.copyProperties(vo,item);
 
-            if (StringUtils.isNotBlank(vo.getIdCard())){
+            if (StringUtils.isNotBlank(item.getIdCard())){
                 //身份证号脱敏
-                vo.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard()));
+                item.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard()));
             }
 
-            if (StringUtils.isNotBlank(vo.getTelphone())){
+            if (StringUtils.isNotBlank(item.getTelphone())){
                 //手机号脱敏
-                vo.setTelphoneStr(TelPhoneUtils.hideTelPhone(vo.getTelphone()));
+                item.setTelphoneStr(TelPhoneUtils.hideTelPhone(vo.getTelphone()));
 
             }
         });

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInvoiceServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.IdCardUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
 import com.zhongzheng.common.utils.http.HttpUtils;
@@ -315,7 +316,16 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
 
     @Override
     public List<OrderInvoiceVo> selectList(OrderInvoiceQueryBo bo) {
-        return baseMapper.selectListByBo(bo);
+        List<OrderInvoiceVo> orderInvoiceVos = baseMapper.selectListByBo(bo);
+        if (CollectionUtils.isNotEmpty(orderInvoiceVos)){
+            for (OrderInvoiceVo vo : orderInvoiceVos) {
+                if (StringUtils.isNotBlank(vo.getIdCard())){
+                    //身份证号脱敏
+                    vo.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard()));
+                }
+            }
+        }
+        return orderInvoiceVos;
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -383,6 +383,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             } else if (vo.getGoodsPayStatus() > 1) {
                 vo.setOrderGoodsStatus(1);
             }
+            if (StringUtils.isNotBlank(vo.getIdCard())){
+                //身份证号脱敏
+                vo.setIdCardStr(IdCardUtils.maskIdCard(vo.getIdCard()));
+            }
+
+            if (StringUtils.isNotBlank(vo.getTelphone())){
+                //手机号脱敏
+                vo.setTelphoneStr(TelPhoneUtils.hideTelPhone(vo.getTelphone()));
+
+            }
         }
         return orderListVos;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderInvoiceVo.java

@@ -164,4 +164,6 @@ public class OrderInvoiceVo {
 	private String openRemark;
 	@ApiModelProperty("处理备注")
 	private String handleRemark;
+	@ApiModelProperty("身份证脱敏字段")
+	private String idCardStr;
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -462,6 +462,9 @@
         <if test="companyName != null and companyName != ''">
             AND u.company_name like concat('%', #{companyName}, '%')
         </if>
+        <if test="sectionName != null and sectionName != ''">
+            AND cs.name like concat('%', #{sectionName}, '%')
+        </if>
         <if test="tenantIds != null and tenantIds.size()!=0 ">
             AND up.tenant_id in
             <foreach collection="tenantIds" item="item" index="index" open="(" close=")" separator=",">