From 984b7d9ab8398233635ca8afa27d76a4a146a547 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 24 十月 2023 17:59:12 +0800
Subject: [PATCH] 修改bug
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java | 3 +++
cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_add.html | 1 -
cloud-server-other/src/main/resources/mapper/BannerMapper.xml | 2 +-
cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 6 ++++++
cloud-server-other/src/main/java/com/dsh/other/model/BannerVo.java | 2 ++
5 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
index ce19795..a76ef76 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
@@ -96,7 +96,13 @@
if (null != phone){
return 5001;
}
+ }else {
+ TAppUser phone = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", query.getPhone()));
+ if (null != phone){
+ return 5001;
+ }
}
+
query.setIsVip(0);
query.setPassword("111111");
query.setInsertTime(new Date());
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 d2e43da..ae71ffa 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
@@ -133,6 +133,9 @@
SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
String format3 = format2.format(data.getVipEndTime());
model.addAttribute("vipEndTime",format3);
+ }else {
+ model.addAttribute("vipEndTime","");
+
}
if (data.getViplevelId()!=null){
// todo创建会员等级表
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_add.html
index f2ddb8a..2058445 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_add.html
@@ -81,7 +81,6 @@
<label class="col-sm-3 control-label">*性别：</label>
<div class="col-sm-9">
<select style="width: 300px" class="form-control" id="gender" name = "gender">
- <option value="" style="color: #b6b6b6" disabled selected>请选择性别</option>
<option value="1">男</option>
<option value="2">女</option>
</select>
diff --git a/cloud-server-other/src/main/java/com/dsh/other/model/BannerVo.java b/cloud-server-other/src/main/java/com/dsh/other/model/BannerVo.java
index 90e19cf..972eaa5 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/model/BannerVo.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/model/BannerVo.java
@@ -23,4 +23,6 @@
private String type;
@ApiModelProperty("跳转页面Id")
private Integer turnId;
+ @ApiModelProperty("跳转模块")
+ private String model;
}
diff --git a/cloud-server-other/src/main/resources/mapper/BannerMapper.xml b/cloud-server-other/src/main/resources/mapper/BannerMapper.xml
index 6b85d1e..2196b9f 100644
--- a/cloud-server-other/src/main/resources/mapper/BannerMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/BannerMapper.xml
@@ -50,7 +50,7 @@
where position = 6
</select>
<select id="list1" resultType="com.dsh.other.model.BannerVo">
- select tb.id as id,tb.img as img, tb.page as page,tb.name as name,tb.type as type,tb.typeId as turnId
+ select tb.id as id,tb.img as img, tb.page as page,tb.name as name,tb.type as type,tb.turnId as turnId , tb.model as model
from t_banner tb
where tb.position = #{position}
</select>
--
Gitblit v1.7.1