Browse Source

修改 bug

ruqinhu 5 years ago
parent
commit
b6bae8c1dd

+ 5 - 2
src/main/java/com/ygj/yuemum/controller/customer/CustomerInfoFeedbackController.java

@@ -2,6 +2,7 @@ package com.ygj.yuemum.controller.customer;
 
 import com.ygj.yuemum.domain.customer.CustomerInfoFeedback;
 import com.ygj.yuemum.domain.customer.dto.CustomerInfoFeedbackDto;
+import com.ygj.yuemum.service.admin.JlAdminUserService;
 import com.ygj.yuemum.service.customer.CustomerInfoFeedbackService;
 import com.ygj.yuemum.utils.ResponseUtil;
 import io.swagger.annotations.Api;
@@ -21,6 +22,9 @@ public class CustomerInfoFeedbackController {
     @Resource
     CustomerInfoFeedbackService customerInfoFeedbackService;
 
+    @Resource
+    JlAdminUserService jlAdminUserService;
+
     @PostMapping("/info/feedback")
     public Map<String, Object> selectByPageNumSize(CustomerInfoFeedbackDto customerInfoFeedbackDto) {
         List<CustomerInfoFeedback> customerInfoFeedbacks = customerInfoFeedbackService.selectByPageNumSize(customerInfoFeedbackDto);
@@ -29,8 +33,7 @@ public class CustomerInfoFeedbackController {
 
     @PostMapping("/info/feedback/insert")
     public Integer insertInfoFeedback(CustomerInfoFeedback customerInfoFeedback) {
-        Object principal = SecurityUtils.getSubject().getPrincipal();
-        customerInfoFeedback.setCreate_person(String.valueOf(principal));
+        customerInfoFeedback.setCreate_person(jlAdminUserService.getUserByDefPrincipal().getName());
         if (StringUtils.isBlank(customerInfoFeedback.getFb_type())) {
             customerInfoFeedback.setFb_type("待确认");
         }

+ 6 - 0
src/main/java/com/ygj/yuemum/service/admin/JlAdminUserService.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.dao.admin.JlAdminUserDao;
 import com.ygj.yuemum.domain.admin.JlAdminUser;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -98,6 +99,11 @@ public class JlAdminUserService {
     public JlAdminUser getUserMkt(String username) {
         return jladminuserdao.getUserMkt(username);
     }
+
+    public JlAdminUser getUserByDefPrincipal() {
+        Object principal = SecurityUtils.getSubject().getPrincipal();
+        return this.getUserMkt(String.valueOf(principal));
+    }
     public int getRolePermissionCount(Integer roleid){
         return jladminuserdao.getRolePermissionCount(roleid);
     }

+ 1 - 2
src/main/java/com/ygj/yuemum/service/customer/CustomerInfoBasicService.java

@@ -87,8 +87,7 @@ public class CustomerInfoBasicService {
 	}
 
 	private void insertServiceLog(Integer sl_no, String type, CustomerInfoBasic customerInfoBasic) {
-		String principal = (String) SecurityUtils.getSubject().getPrincipal();
-		JlAdminUser jlAdminUser = jladminuserService.getUserMkt(principal);
+		JlAdminUser jlAdminUser = jladminuserService.getUserByDefPrincipal();
 
 		CustomerInfoServiceLog customerInfoServiceLog = new CustomerInfoServiceLog();
 		customerInfoServiceLog.setSl_userid(jlAdminUser.getId());

+ 1 - 2
src/main/java/com/ygj/yuemum/service/customer/CustomerInfoFeedbackService.java

@@ -60,8 +60,7 @@ public class CustomerInfoFeedbackService {
     }
 
     private void insertServiceLog(Integer sl_no, String type, CustomerInfoFeedback customerInfoBasic) {
-        String principal = (String) SecurityUtils.getSubject().getPrincipal();
-        JlAdminUser jlAdminUser = jladminuserService.getUserMkt(principal);
+        JlAdminUser jlAdminUser = jladminuserService.getUserByDefPrincipal();
 
         CustomerInfoServiceLog customerInfoServiceLog = new CustomerInfoServiceLog();
         customerInfoServiceLog.setSl_userid(jlAdminUser.getId());

+ 1 - 2
src/main/java/com/ygj/yuemum/service/customer/CustomerInfoFollowService.java

@@ -71,8 +71,7 @@ public class CustomerInfoFollowService {
 
 
 	private void insertServiceLog(Integer sl_no, String type, CustomerInfoFollow customerInfoFollow) {
-		String principal = (String) SecurityUtils.getSubject().getPrincipal();
-		JlAdminUser jlAdminUser = jladminuserService.getUserMkt(principal);
+		JlAdminUser jlAdminUser = jladminuserService.getUserByDefPrincipal();
 
 		CustomerInfoServiceLog customerInfoServiceLog = new CustomerInfoServiceLog();
 		customerInfoServiceLog.setSl_userid(jlAdminUser.getId());