From 9d19ca02aa30c4d486a4cfe861d698d454ce8d5b Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 30 十月 2023 10:08:29 +0800
Subject: [PATCH] 商户认证代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
index ae71ffa..58c709a 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
@@ -15,6 +15,7 @@
import com.dsh.course.feignClient.other.StoreClient;
import com.dsh.course.feignClient.other.model.SiteChangeStateVO;
import com.dsh.guns.config.UserExt;
+import com.dsh.guns.modular.system.controller.util.MD5;
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.IRoleService;
@@ -176,7 +177,10 @@
List<QueryAppUserVO> queryAppUserVOS = appUserClient.listAll(queryAppUser);
for (QueryAppUserVO queryAppUserVO : queryAppUserVOS) {
if (queryAppUserVO.getSalesmanUserId()!=null){
- queryAppUserVO.setSalesmanUserName(userService.getById(queryAppUserVO.getSalesmanUserId()).getName());
+ User byId = userService.getById(queryAppUserVO.getSalesmanUserId());
+ if (byId!=null){
+ queryAppUserVO.setSalesmanUserName(byId.getName());
+ }
}
}
if (salesmanUserName!=null && (!salesmanUserName.equals(""))){
@@ -203,6 +207,7 @@
@ResponseBody
public Object addAppUser(@RequestBody TAppUser appUser){
Integer objectType = UserExt.getUser().getObjectType();
+ appUser.setPassword(MD5.md5("111111"));
appUser.setInsertType(objectType);
appUser.setAddUserId(UserExt.getUser().getObjectId());
Object o = appUserClient.addAppUser1(appUser);
--
Gitblit v1.7.1