修改 bug

src/main/java/com/ygj/yuemum/controller/customer/CustomerInfoBasicController.java

@@ -2,6 +2,7 @@ package com.ygj.yuemum.controller.customer;
 
 import com.ygj.yuemum.domain.customer.CustomerInfoBasic;
 import com.ygj.yuemum.domain.customer.dto.CustomerInfoBasicDto;
+import com.ygj.yuemum.service.admin.JlAdminUserService;
 import com.ygj.yuemum.service.customer.CustomerInfoBasicService;
 import com.ygj.yuemum.utils.ResponseUtil;
 import io.swagger.annotations.Api;
@@ -21,6 +22,9 @@ public class CustomerInfoBasicController {
     @Resource
     private CustomerInfoBasicService customerInfoBasicService;
 
+    @Resource
+    JlAdminUserService jlAdminUserService;
+
     /**
      * [新增]
      * @author zrz
@@ -28,8 +32,7 @@ public class CustomerInfoBasicController {
      **/
     @RequestMapping("/insert")
     public int insert(CustomerInfoBasic customerInfoBasic){
-        Object principal = SecurityUtils.getSubject().getPrincipal();
-        customerInfoBasic.setCreate_person(String.valueOf(principal));
+        customerInfoBasic.setCreate_person(jlAdminUserService.getUserByDefPrincipal().getName());
         return customerInfoBasicService.insert(customerInfoBasic);
     }
 

src/main/java/com/ygj/yuemum/controller/customer/CustomerInfoFollowController.java

@@ -4,6 +4,7 @@ import com.ygj.yuemum.component.Constant;
 import com.ygj.yuemum.domain.admin.Photo;
 import com.ygj.yuemum.domain.customer.CustomerInfoFollow;
 import com.ygj.yuemum.domain.customer.dto.CustomerInfoFollowDto;
+import com.ygj.yuemum.service.admin.JlAdminUserService;
 import com.ygj.yuemum.service.customer.CustomerInfoFollowService;
 import com.ygj.yuemum.utils.OssService;
 import com.ygj.yuemum.utils.ResponseUtil;
@@ -34,6 +35,9 @@ public class CustomerInfoFollowController {
     private CustomerInfoFollowService customerInfoFollowService;
 
     @Resource
+    JlAdminUserService jlAdminUserService;
+
+    @Resource
     private OssService ossService;
 
     /**
@@ -43,6 +47,7 @@ public class CustomerInfoFollowController {
     **/
     @RequestMapping("/insert")
     public int insert(CustomerInfoFollow customerInfoFollow){
+        customerInfoFollow.setCreate_person(jlAdminUserService.getUserByDefPrincipal().getName());
         return customerInfoFollowService.insert(customerInfoFollow);
     }
 

src/main/resources/mybatis/mapper/order/YSOrder.xml

@@ -174,6 +174,9 @@
         <if test="od_user != null and od_user != ''">
             and od_user = #{od_user,jdbcType=INTEGER}
         </if>
+        <if test="od_date != null and od_date != ''">
+            and od_date like concat ('%',#{od_date,jdbcType=VARCHAR},'%')
+        </if>
         order by id desc
     </select>