From f98a54040341f7a33e0849532007849ee9597aee Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期一, 23 十月 2023 18:05:05 +0800
Subject: [PATCH] canshu

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 0c9cd0b..c6e4de3 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -500,7 +500,9 @@
                     order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
                     order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
                     order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
-                    order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+                    if (tjCustomer.getCusIdcard()!=null){
+                        order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+                    }
                 }
                 String firmId = order.getFirmId();
                 if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
@@ -744,6 +746,24 @@
         return success(tjOrderService.selectTjOrderByOrderId(orderId));
     }
 
+
+
+    @GetMapping("/getIsRequired")
+    @ApiOperation(value = "鏍规嵁鍙傛暟閰嶇疆鑾峰彇鏄惁蹇呭~椤癸紙韬唤璇併�佹�у埆銆佺數璇濄�佺収鐗囥�佹槸鍚︾洿鎺ヤ笅鍗曪級")
+    public AjaxResult getIsRequired() {
+        Map<String,String> res=new HashMap<>();
+        res.put("has_idcard",configService.selectConfigByKey("has_idcard"));
+        res.put("has_sex",configService.selectConfigByKey("has_sex"));
+        res.put("is_phone",configService.selectConfigByKey("is_phone"));
+        res.put("mall_hasPhoto",configService.selectConfigByKey("mall_hasPhoto"));
+        res.put("has_charge",configService.selectConfigByKey("has_charge"));
+        return AjaxResult.success(res);
+    }
+
+
+
+
+
     /**
      * 浣撴绛惧埌鐧昏鎺ュ彛
      */

--
Gitblit v1.8.0