From be8fdcb9d380f555981d17b851cd55f630d41aba Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 16 十月 2023 18:00:21 +0800
Subject: [PATCH] 10.16
---
cloud-server-other/src/main/java/com/dsh/other/entity/Site.java | 2 ++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java | 11 +++++++++--
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 1 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/MenuController.java | 7 ++++++-
cloud-server-other/src/main/java/com/dsh/other/model/QuerySiteInfoVo.java | 4 ++++
cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html | 4 ++--
6 files changed, 24 insertions(+), 5 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 19de033..1afed17 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
@@ -110,16 +110,23 @@
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
String province = data.getProvince();
TCity province1 = cityService.getOne(new QueryWrapper<TCity>().eq("name", data.getProvince()));
+
+ if (province1!=null){
List<TCity> city = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, province1.getId()));
+ model.addAttribute("city",city);
+
+ }
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ if (data.getBirthday()!=null){
String format1 = format.format(data.getBirthday());
+ model.addAttribute("birthday",format1);
+ }
List<User> sales = userService.list(new QueryWrapper<User>().eq("deptid", 2));
model.addAttribute("list",list);
model.addAttribute("roleType",roleType);
model.addAttribute("sales",sales);
model.addAttribute("data",data);
- model.addAttribute("birthday",format1);
- model.addAttribute("city",city);
+
model.addAttribute("type",type);
model.addAttribute("isVip",data.getIsVip());
if (data.getVipEndTime()!=null){
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/MenuController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/MenuController.java
index 05c1a31..87ca89d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/MenuController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/MenuController.java
@@ -1,5 +1,6 @@
package com.dsh.guns.modular.system.controller.system;
+import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.model.node.ZTreeNode;
import com.dsh.guns.config.UserExt;
@@ -229,10 +230,14 @@
@ResponseBody
public List<ZTreeNode> menuTreeListByRoleId(@PathVariable Integer roleId) {
List<Long> menuIds = this.menuService.getMenuIdsByRoleId(roleId);
- if (Objects.isNull(menuIds)) {
+ System.out.println("=====menuIds==========="+menuIds);
+ if (CollectionUtil.isEmpty(menuIds)) {
+ System.out.println("=====menuIds1==========="+menuIds);
+
List<ZTreeNode> roleTreeList = this.menuService.menuTreeList();
return roleTreeList;
} else {
+
// List<ZTreeNode> roleTreeList = this.menuService.menuTreeList();
List<ZTreeNode> roleTreeListByUserId = this.menuService.menuTreeListByMenuIds(menuIds);
return roleTreeListByUserId;
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html
index 32fada2..1292e28 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html
@@ -58,7 +58,7 @@
<label class="col-sm-3 control-label">*所在市：</label>
<div class="col-sm-9">
<select style="width: 300px" class="form-control" id="cCode" name="cCode" >
- @for(obj in city){
+ @for(obj in city!){
<option style="width: 300px" value="${obj.code}"${obj.name == data.province ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
@@ -76,7 +76,7 @@
<div class="form-group" >
<label class="col-sm-3 control-label">*生日：</label>
<div class="col-sm-9" style="display: flex;">
- <input style="width: 300px" class="form-control" value="${birthday}" id="birthday" placeholder="请选择" type="date">
+ <input style="width: 300px" class="form-control" value="${birthday!}" id="birthday" placeholder="请选择" type="date">
</div>
</div>
<div class="form-group" >
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java b/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
index e7d6edc..a7f230d 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
@@ -124,5 +124,7 @@
private Double playPaiCoinOne;
@TableField("ids")
private String ids;
+ @TableField("typeName")
+ private String typeName;
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/model/QuerySiteInfoVo.java b/cloud-server-other/src/main/java/com/dsh/other/model/QuerySiteInfoVo.java
index 389d485..e32525b 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/model/QuerySiteInfoVo.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/model/QuerySiteInfoVo.java
@@ -53,4 +53,8 @@
@ApiModelProperty("玩湃币价格（x/半小时）半场")
private Integer playPaiCoinOne;
+
+ @ApiModelProperty("场地类型名称（智慧球场or其他）")
+ private String typeName;
+
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
index 4d85cff..ea18418 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
@@ -105,6 +105,7 @@
Store store = storeService.getById(site.getStoreId());
QuerySiteInfoVo querySiteInfoVo = new QuerySiteInfoVo();
querySiteInfoVo.setId(site.getId());
+ querySiteInfoVo.setTypeName(site.getTypeName());
querySiteInfoVo.setName(site.getName());
querySiteInfoVo.setSiteTypeName(siteType.getName());
querySiteInfoVo.setStoreName(store.getName());
--
Gitblit v1.7.1