From 5ecb954f03f2da90df620155cc98edf3b8184b3d Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 26 十月 2023 15:07:33 +0800
Subject: [PATCH] 修改bug
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/DeptController.java | 4
cloud-server-management/src/main/webapp/static/modular/system/user/user.js | 6
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/UserServiceImpl.java | 6 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DeptServiceImpl.java | 8 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 17 ++
cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java | 4
cloud-server-management/src/main/java/com/dsh/course/mapper/RoleMapper.java | 10 +
cloud-server-activity/src/main/java/com/dsh/activity/model/request/CouponDataVo.java | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Dept.java | 21 ++++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IRoleService.java | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/RoleServiceImpl.java | 13 +-
cloud-server-management/src/main/resources/mapper/DeptMapper.xml | 12 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Role.java | 21 ++++
cloud-server-management/src/main/resources/mapper/UserMapper.xml | 3
cloud-server-management/src/main/resources/mapper/RoleMapper.xml | 19 ++-
cloud-server-activity/src/main/resources/mapper/CouponMapper.xml | 8 +
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 9 +
cloud-server-management/src/main/java/com/dsh/course/mapper/DeptMapper.java | 6
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java | 10 +
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html | 2
cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCoupon.js | 14 ++
cloud-server-management/src/main/java/com/dsh/course/mapper/UserMapper.java | 6 +
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CouponListOfSearch.java | 1
cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CouponDataVo.java | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_edit.html | 3
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java | 2
cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js | 7 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 1
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 12 ++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/MenuServiceImpl.java | 17 +++
34 files changed, 211 insertions(+), 47 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
index d001de6..f49d537 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -239,6 +239,11 @@
collect.add(-1);
}
if(collect.contains(ofSearch.getStoreId())){
+ if(collect.size()>1){
+ map.put("size",1);
+ }else {
+ map.put("size",0);
+ }
mapList.add(map);
}
}
@@ -502,6 +507,10 @@
coupon.setPublisherType(1);
coupon.setCityManagerId(dataVo.getCityManagerId());
}
+ if(dataVo.getObjType()!=1){
+ coupon.setAuditStatus(1);
+ }
+
boolean save = couponService.save(coupon);
if (save){
if (dataVo.getCompany() == 3){
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java
index b557c6b..434ddf2 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java
@@ -25,5 +25,5 @@
private String cityCode;
private Integer storeId;
-
+ private Integer objType;
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java
index a9439b1..1398eff 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java
@@ -30,8 +30,8 @@
@Param("state")Integer state,
@Param("page")Page<Map<String, Object>> page,
@Param("cityCode") String cityCode,
- @Param("storeId")Integer storeId
-
+ @Param("storeId")Integer storeId,
+ @Param("objType")Integer objType
);
List<Map<String, Object>> queryCouponListOfSearch1(@Param("name")String name,
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/request/CouponDataVo.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/request/CouponDataVo.java
index ab4876c..85bf34b 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/model/request/CouponDataVo.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/request/CouponDataVo.java
@@ -96,4 +96,6 @@
* 门店列表
*/
String storeIds;
+
+ Integer objType;
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
index dc3b928..c32da70 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
@@ -105,7 +105,7 @@
@Override
public List<Map<String, Object>> queryCouponListOfSearch(CouponListOfSearch ofSearch) {
- return this.baseMapper.queryCouponListOfSearch(ofSearch.getName(),ofSearch.getType(),ofSearch.getDistributionMethod(),ofSearch.getUserPopulation(),ofSearch.getStatus(),ofSearch.getState(),ofSearch.getPage(),ofSearch.getCityCode(),ofSearch.getStoreId());
+ return this.baseMapper.queryCouponListOfSearch(ofSearch.getName(),ofSearch.getType(),ofSearch.getDistributionMethod(),ofSearch.getUserPopulation(),ofSearch.getStatus(),ofSearch.getState(),ofSearch.getPage(),ofSearch.getCityCode(),ofSearch.getStoreId(),ofSearch.getObjType());
}
@Override
diff --git a/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml b/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
index 6a859aa..7a908fb 100644
--- a/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
@@ -28,9 +28,13 @@
pickUpQuantity,
`status`,
state,
- illustrate
+ illustrate,
+ auditStatus
from t_coupon
- where 1 = 1
+ where 1=1
+ <if test="objType == 1">
+ and auditStatus =2
+ </if>
<if test="cityCode != null">
and id in(
SELECT DISTINCT couponId FROM
diff --git a/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml b/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
index e300b16..27fce56 100644
--- a/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
@@ -86,7 +86,7 @@
`sort`,
shelves
from t_points_merchandise
- where 1 = 1
+ where status =1
<if test="query.name != null">
and `name` like concat('%', #{query.name}, '%')
</if>
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CouponListOfSearch.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CouponListOfSearch.java
index 4fff639..f8e86a6 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CouponListOfSearch.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/CouponListOfSearch.java
@@ -24,5 +24,6 @@
private Page<Map<String, Object>> page;
private String cityCode;
private Integer storeId;
+ private Integer objType;
}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/DeptMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/DeptMapper.java
index eb65024..d969d44 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/DeptMapper.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/DeptMapper.java
@@ -22,11 +22,13 @@
/**
* 获取ztree的节点列表
*/
- List<ZTreeNode> tree();
+ List<ZTreeNode> tree(@Param("type") Integer type, @Param("id") Integer id);
+
+ List<Map<String, Object>> list(@Param("condition") String condition, @Param("objectType") Integer objectType, @Param("objectId") Integer objectId);
/**
* 获取所有部门列表
*/
- List<Map<String, Object>> list(@Param("condition") String condition);
+// List<Map<String, Object>> list(@Param("condition") String condition);
}
\ No newline at end of file
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/RoleMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/RoleMapper.java
index f1bea3a..368fbfa 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/RoleMapper.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/RoleMapper.java
@@ -24,8 +24,8 @@
* @return
* @date 2017年2月12日 下午9:14:34
*/
- List<Map<String, Object>> selectRoles(@Param("condition") String condition);
-
+// List<Map<String, Object>> selectRoles(@Param("condition") String condition);
+ List<Map<String, Object>> selectRoles(@Param("condition") String condition, @Param("objectType") Integer objectType, @Param("objectId") Integer objectId);
/**
* 删除某个角色的所有权限
*
@@ -41,7 +41,7 @@
* @return
* @date 2017年2月18日 上午10:32:04
*/
- List<ZTreeNode> roleTreeList();
+ List<ZTreeNode> roleTreeList(@Param("type") Integer type, @Param("id") Integer id);
/**
* 获取角色列表树
@@ -49,5 +49,7 @@
* @return
* @date 2017年2月18日 上午10:32:04
*/
- List<ZTreeNode> roleTreeListByRoleId(String[] roleId);
+ List<ZTreeNode> roleTreeListByRoleId(@Param("array") String[] roleId, @Param("type") Integer type, @Param("id") Integer id);
+
+
}
\ No newline at end of file
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/UserMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/UserMapper.java
index 09e13cf..d9130f7 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/UserMapper.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/UserMapper.java
@@ -51,10 +51,14 @@
*/
Integer getMenuNumByRole(@Param("roleStr") String roleStr);
+
+
List<Map<String,Object>> getUserListPage(@Param("page") Page<Map<String, Object>> page,
@Param("dataScope") DataScope dataScope,
@Param("name") String name,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
- @Param("deptid") Integer deptid);
+ @Param("deptid") Integer deptid,
+ @Param("objectType") Integer objectType,
+ @Param("objectId") Integer objectId);
}
\ No newline at end of file
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
index 5ea1b14..f9920dd 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -216,9 +216,10 @@
ofSearch.setUserPopulation(userPopulation);
ofSearch.setStatus(status);
ofSearch.setState(state);
-// if (UserExt.getUser().getObjectType()==3) {
-// ofSearch.setStoreId(UserExt.getUser().getObjectId());
-// }
+ if (UserExt.getUser().getObjectType()==3) {
+ ofSearch.setStoreId(UserExt.getUser().getObjectId());
+ ofSearch.setObjType(UserExt.getUser().getObjectType());
+ }
return client.getCouponListOfSearch(ofSearch);
@@ -344,9 +345,16 @@
System.out.println(dataVo);
Integer objectType = UserExt.getUser().getObjectType();
dataVo.setUserType(objectType);
+ if(UserExt.getUser().getObjectType()==3){
+ dataVo.setStoreIds(UserExt.getUser().getObjectId().toString());
+ dataVo.setCompany(3);
+ }
+ dataVo.setObjType(UserExt.getUser().getObjectType());
client.insertIntoData(dataVo);
return new SuccessTip<>();
}
+
+
@PostMapping(value = "/update")
@ResponseBody
public Object update( Integer id,Integer num,Integer num1,String text){
@@ -354,6 +362,9 @@
coupon.setQuantityIssued(num);
coupon.setPickUpQuantity(num1);
coupon.setIllustrate(text);
+ if (UserExt.getUser().getObjectType()==3) {
+ coupon.setAuditStatus(1);
+ }
client.updateCouponData(coupon);
return new SuccessTip<>();
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
index 7322351..2deb31a 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -534,6 +534,7 @@
}else {
+ // ?
pointsMerchandise.setShelves(storeId);
pointsMerchandise.setUseScope(3);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index 1623201..b7c5f3c 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -670,10 +670,14 @@
model.addAttribute("city", list1);
String code1 = list1.get(0).get("code").toString();
List<TStore> list2 = storeService.list(new QueryWrapper<TStore>().eq("cityCode", code1).eq("state", 1));
+ if(UserExt.getUser().getObjectType()==3){
+ list2=storeService.list(new QueryWrapper<TStore>().eq("id", UserExt.getUser().getObjectId()).eq("state", 1));
+ }
model.addAttribute("store", list2);
TStore store = list2.get(0);
List<TSite> list3 = siteService.list(new QueryWrapper<TSite>().eq("storeId", store.getId()).eq("state", 1));
model.addAttribute("site", list3);
+ model.addAttribute("objType", UserExt.getUser().getObjectType());
return PREFIX+"yuyue_edit.html";
@@ -1089,8 +1093,14 @@
List<Map<String, Object>> list1 = storeService.queryCity(code.toString(), cityCode);
model.addAttribute("city", list1);
String code1 = list1.get(0).get("code").toString();
- List<TStore> list2 = storeService.list(new QueryWrapper<TStore>().eq("cityCode", code1).eq("state", 1));
+ List<TStore> list2 =new ArrayList<>();
+ if(objectType==3){
+ list2 = storeService.list(new QueryWrapper<TStore>().eq("id", objectId).eq("state", 1));
+ }else {
+ list2 = storeService.list(new QueryWrapper<TStore>().eq("cityCode", code1).eq("state", 1));
+ }
model.addAttribute("store", list2);
+
TStore store = list2.get(0);
List<TSite> list3 = siteService.list(new QueryWrapper<TSite>().eq("storeId", store.getId()).eq("state", 1));
model.addAttribute("site", list3);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/DeptController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/DeptController.java
index 2fe013e..fe588af 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/DeptController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/DeptController.java
@@ -81,6 +81,7 @@
@ResponseBody
public List<ZTreeNode> tree() {
List<ZTreeNode> tree = this.deptService.tree();
+
tree.add(ZTreeNode.createParent());
return tree;
}
@@ -98,7 +99,8 @@
}
//完善pids,根据pid拿到pid的pids
deptSetPids(dept);
-
+ dept.setObjectType(UserExt.getUser().getObjectType());
+ dept.setObjectId(UserExt.getUser().getObjectId());
return this.deptService.save(dept);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java
index 4f3cac3..a532422 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java
@@ -125,6 +125,8 @@
throw new GunsException(BizExceptionEnum.REQUEST_NULL);
}
role.setId(null);
+ role.setObjType(UserExt.getUser().getObjectType());
+ role.setObjId(UserExt.getUser().getObjectId());
this.roleService.save(role);
@@ -216,7 +218,7 @@
@RequestMapping(value = "/roleTreeList")
@ResponseBody
public List<ZTreeNode> roleTreeList() {
- List<ZTreeNode> roleTreeList = this.roleService.roleTreeList();
+ List<ZTreeNode> roleTreeList = this.roleService.roleTreeList(UserExt.getUser().getObjectType(),UserExt.getUser().getObjectId());
roleTreeList.add(ZTreeNode.createParent());
return roleTreeList;
}
@@ -229,12 +231,14 @@
public List<ZTreeNode> roleTreeListByUserId(@PathVariable Integer userId) {
User theUser = this.userService.getById(userId);
String roleid = theUser.getRoleid();
+ Integer objectType = UserExt.getUser().getObjectType();
+ Integer objectId = UserExt.getUser().getObjectId();
if (Objects.isNull(roleid)) {
- List<ZTreeNode> roleTreeList = this.roleService.roleTreeList();
+ List<ZTreeNode> roleTreeList = this.roleService.roleTreeList(objectType,objectId);
return roleTreeList;
} else {
String[] strArray = Convert.toStrArray(",", roleid);
- List<ZTreeNode> roleTreeListByUserId = this.roleService.roleTreeListByRoleId(strArray);
+ List<ZTreeNode> roleTreeListByUserId = this.roleService.roleTreeListByRoleId(strArray,objectType,objectId);
return roleTreeListByUserId;
}
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
index 237c92c..0672197 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
@@ -222,6 +222,8 @@
user.setCreatetime(new Date());
User objectUser = UserFactory.createUser(user);
+ objectUser.setObjectType(UserExt.getUser().getObjectType());
+ objectUser.setObjectId(UserExt.getUser().getObjectId());
//查找平台所属公司
//Search for the company that owns the platform.
this.userService.save(objectUser);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CouponDataVo.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CouponDataVo.java
index c3089f7..431c6aa 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CouponDataVo.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CouponDataVo.java
@@ -96,4 +96,6 @@
* 门店列表
*/
String storeIds;
+
+ Integer objType;
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Dept.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Dept.java
index 5b5f891..d5dca00 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Dept.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Dept.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -55,6 +56,26 @@
*/
private Integer version;
+ @TableField("objectType")
+ private Integer objectType;
+ @TableField("objectId")
+ private Integer objectId;
+
+ public Integer getObjectType() {
+ return objectType;
+ }
+
+ public void setObjectType(Integer objectType) {
+ this.objectType = objectType;
+ }
+
+ public Integer getObjectId() {
+ return objectId;
+ }
+
+ public void setObjectId(Integer objectId) {
+ this.objectId = objectId;
+ }
public Integer getId() {
return id;
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Role.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Role.java
index 1486fc6..44fc624 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Role.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Role.java
@@ -1,6 +1,7 @@
package com.dsh.guns.modular.system.model;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -50,6 +51,26 @@
*/
private Integer version;
+ @TableField("objType")
+ private Integer objType;
+ @TableField("objId")
+ private Integer objId;
+
+ public Integer getObjType() {
+ return objType;
+ }
+
+ public void setObjType(Integer objType) {
+ this.objType = objType;
+ }
+
+ public Integer getObjId() {
+ return objId;
+ }
+
+ public void setObjId(Integer objId) {
+ this.objId = objId;
+ }
public Integer getId() {
return id;
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IRoleService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IRoleService.java
index 19659bb..0a79a58 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IRoleService.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IRoleService.java
@@ -56,7 +56,7 @@
* @return
* @date 2017年2月18日 上午10:32:04
*/
- List<ZTreeNode> roleTreeList();
+ List<ZTreeNode> roleTreeList(Integer type,Integer id);
/**
* 获取角色列表树
@@ -64,5 +64,5 @@
* @return
* @date 2017年2月18日 上午10:32:04
*/
- List<ZTreeNode> roleTreeListByRoleId(String[] roleId);
+ List<ZTreeNode> roleTreeListByRoleId(String[] roleId,Integer type,Integer id);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DeptServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DeptServiceImpl.java
index cbb7ddd..1ad113f 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DeptServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DeptServiceImpl.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.course.mapper.DeptMapper;
import com.dsh.course.model.node.ZTreeNode;
+import com.dsh.guns.config.UserExt;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -38,11 +39,14 @@
@Override
public List<ZTreeNode> tree() {
- return this.baseMapper.tree();
+
+ return this.baseMapper.tree(UserExt.getUser().getObjectType(),UserExt.getUser().getObjectId());
}
@Override
public List<Map<String, Object>> list(String condition) {
- return this.baseMapper.list(condition);
+ Integer objectType = UserExt.getUser().getObjectType();
+ Integer objectId = UserExt.getUser().getObjectId();
+ return this.baseMapper.list(condition,objectType,objectId);
}
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/MenuServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/MenuServiceImpl.java
index fe4a69a..ccb64d9 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/MenuServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/MenuServiceImpl.java
@@ -2,14 +2,20 @@
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.course.mapper.MenuMapper;
import com.dsh.course.model.node.MenuNode;
import com.dsh.course.model.node.ZTreeNode;
+import com.dsh.guns.config.UserExt;
+import com.dsh.guns.modular.system.model.Relation;
+import com.dsh.guns.modular.system.service.IRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.dsh.guns.modular.system.model.Menu;
@@ -64,9 +70,18 @@
return this.baseMapper.getMenuIdsByRoleId(roleId);
}
+
+ @Autowired
+ private IRelationService relationService;
@Override
public List<ZTreeNode> menuTreeList() {
- return this.baseMapper.menuTreeList();
+ List<ZTreeNode> zTreeNodes = this.baseMapper.menuTreeList();
+ if(UserExt.getUser().getObjectType()==3){
+ List<Relation> list = relationService.list(new LambdaQueryWrapper<Relation>().eq(Relation::getRoleid, 3));
+ List<Long> collect = list.stream().map(Relation::getMenuid).collect(Collectors.toList());
+ zTreeNodes= zTreeNodes.stream().filter(e -> collect.contains(e.getId())).collect(Collectors.toList());
+ }
+ return zTreeNodes;
}
@Override
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/RoleServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/RoleServiceImpl.java
index 2e2f50a..c0383cd 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/RoleServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/RoleServiceImpl.java
@@ -9,6 +9,7 @@
import com.dsh.course.mapper.RelationMapper;
import com.dsh.course.mapper.RoleMapper;
import com.dsh.course.model.node.ZTreeNode;
+import com.dsh.guns.config.UserExt;
import com.dsh.guns.modular.system.controller.util.Convert;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -54,7 +55,9 @@
@Override
public List<Map<String, Object>> selectRoles(String condition) {
- return this.baseMapper.selectRoles(condition);
+ Integer objectType = UserExt.getUser().getObjectType();
+ Integer objectId = UserExt.getUser().getObjectId();
+ return this.baseMapper.selectRoles(condition,objectType,objectId);
}
@Override
@@ -63,13 +66,13 @@
}
@Override
- public List<ZTreeNode> roleTreeList() {
- return this.baseMapper.roleTreeList();
+ public List<ZTreeNode> roleTreeList(Integer type,Integer id) {
+ return this.baseMapper.roleTreeList(type,id);
}
@Override
- public List<ZTreeNode> roleTreeListByRoleId(String[] roleId) {
- return this.baseMapper.roleTreeListByRoleId(roleId);
+ public List<ZTreeNode> roleTreeListByRoleId(String[] roleId,Integer type,Integer id) {
+ return this.baseMapper.roleTreeListByRoleId(roleId,type,id);
}
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/UserServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/UserServiceImpl.java
index 52203d7..332132f 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/UserServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/UserServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.course.mapper.UserMapper;
+import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.dataScope.DataScope;
import org.springframework.stereotype.Service;
@@ -53,7 +54,10 @@
@Override
public List<Map<String, Object>> getUserListPage(Page<Map<String, Object>> page, DataScope dataScope, String name, String beginTime, String endTime, Integer deptid) {
- List<Map<String, Object>> userListPage = this.baseMapper.getUserListPage(page, dataScope, name, beginTime, endTime, deptid);
+ Integer objectType = UserExt.getUser().getObjectType();
+ Integer objectId = UserExt.getUser().getObjectId();
+
+ List<Map<String, Object>> userListPage = this.baseMapper.getUserListPage(page, dataScope, name, beginTime, endTime, deptid,objectType,objectId);
return userListPage;
}
}
diff --git a/cloud-server-management/src/main/resources/mapper/DeptMapper.xml b/cloud-server-management/src/main/resources/mapper/DeptMapper.xml
index c839682..88bdbec 100644
--- a/cloud-server-management/src/main/resources/mapper/DeptMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/DeptMapper.xml
@@ -23,13 +23,19 @@
ELSE
'false'
END
- ) as isOpen from sys_dept
+ ) as isOpen from sys_dept where 1=1
+ <if test="type ==3 ">
+ and objectType =3 and objectId =#{id}
+ </if>
</select>
<select id="list" resultType="map">
- select * from sys_dept
+ select * from sys_dept where 1=1
<if test="condition != null and condition != ''">
- where simplename like CONCAT('%',#{condition},'%') or fullname like CONCAT('%',#{condition},'%')
+ and simplename like CONCAT('%',#{condition},'%') or fullname like CONCAT('%',#{condition},'%')
+ </if>
+ <if test="objectType == 3">
+ and objectType = 3 and objectId =#{objectId}
</if>
order by num ASC
</select>
diff --git a/cloud-server-management/src/main/resources/mapper/RoleMapper.xml b/cloud-server-management/src/main/resources/mapper/RoleMapper.xml
index 839a3a7..1f859cb 100644
--- a/cloud-server-management/src/main/resources/mapper/RoleMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/RoleMapper.xml
@@ -19,9 +19,12 @@
<select id="selectRoles" resultType="map">
select rr.*,(SELECT COUNT(id) from sys_user where FIND_IN_SET(rr.id,roleid)) as userCount
- from sys_role as rr
+ from sys_role as rr where 1=1
<if test="condition != null">
- where rr.name like CONCAT('%',#{condition},'%')
+ and rr.name like CONCAT('%',#{condition},'%')
+ </if>
+ <if test="objectType == 3">
+ and rr.objType =3 and rr.objId =#{objectId}
</if>
</select>
@@ -32,10 +35,13 @@
<select id="roleTreeList" resultType="com.dsh.course.model.node.ZTreeNode">
select id "id",pId
"pId",name as "name",(case when (pId=0 or pId is null) then 'true'
- else 'false' end) "open" from sys_role
+ else 'false' end) "open" from sys_role where 1=1
+ <if test="type==3">
+ and objType =3 and objId =#{id}
+ </if>
</select>
- <select id="roleTreeListByRoleId" resultType="com.dsh.course.model.node.ZTreeNode">
+ <select id="roleTreeListByRoleId" resultType="com.dsh.course.model.node.ZTreeNode">
SELECT
r.id "id",
pId "pId",
@@ -65,11 +71,12 @@
sys_role
WHERE
ID IN
-
<foreach collection="array" index="index" item="i" open="(" separator="," close=")">
#{i}
</foreach>
-
+ <if test="type==3">
+ and objType =3 and objId =#{id}
+ </if>
) r1 ON r.ID = r1.ID
ORDER BY
pId,
diff --git a/cloud-server-management/src/main/resources/mapper/UserMapper.xml b/cloud-server-management/src/main/resources/mapper/UserMapper.xml
index 4f973fa..0548540 100644
--- a/cloud-server-management/src/main/resources/mapper/UserMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/UserMapper.xml
@@ -106,6 +106,9 @@
<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
and (o.createTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
</if>
+ <if test="objectType ==3">
+ and (o.objectType =3 and o.objectId =#{objectId})
+ </if>
</where>
order by o.id desc
</select>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_edit.html
index 43eef87..04679c5 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_edit.html
@@ -9,6 +9,7 @@
<input type="hidden" id="id" value="${item.id}">
<div class="form-horizontal">
<div class="row">
+ @if(objType !=3){
<div class="form-group">
<label class="col-sm-3 control-label">*所在省：</label>
<div class="col-sm-4">
@@ -29,6 +30,8 @@
</select>
</div>
</div>
+ @}
+
<div class="form-group">
<label class="col-sm-3 control-label">*所属门店：</label>
<div class="col-sm-4">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html
index 1346bd3..8c87b06 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html
@@ -45,7 +45,7 @@
@if(shiro.hasPermission("/mgr/unfreeze")){
<#button name="解冻" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
@}
- @if(shiro.hasPermission("/mgr/setRole")){
+ @if(shiro.hasPermission("/mgr/setRoles")){
<#button name="角色分配" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/kanbanPermissions")){
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCoupon.js b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCoupon.js
index 037d16f..0795f36 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCoupon.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCoupon.js
@@ -45,6 +45,10 @@
formatter: function (value, row, index) {
return {1: "上架", 2: "下架"}[value]
}},
+ {title: '审核状态', field: 'auditStatus', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row, index) {
+ return {1: "待审核", 2: "已通过",3: "已拒绝"}[value]
+ }},
];
};
@@ -83,6 +87,11 @@
*/
TCoupon.openChange = function () {
if (this.check()){
+ let size = TCoupon.seItem.size
+ if(size>0){
+ Feng.info("没有该权限");
+ return;
+ }
let id = TCoupon.seItem.id
let name = TCoupon.seItem.name
let quantityIssued = TCoupon.seItem.quantityIssued
@@ -238,6 +247,11 @@
};
TCoupon.onShelf = function (e) {
if (this.check()) {
+ let size = TCoupon.seItem.size
+ if(size>0){
+ Feng.info("没有该权限");
+ return;
+ }
var ajax = new $ax(Feng.ctxPath + "/tCouponManage/onShelf", function(data){
if(data.code==200){
Feng.success("操作成功！")
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js
index 50bba9f..6dbb6fd 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js
@@ -584,6 +584,13 @@
$('#storeSelect').show();
}
if (userType === '3'){
+ // 兑换方式
+ $('#exchangeType').show();
+ $('#needAmount').show();
$('#needIntegral').show();
+ // 图片
+ $('#app').show();
+ $('#app1').show();
+ // 适用范围
}
});
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/user/user.js b/cloud-server-management/src/main/webapp/static/modular/system/user/user.js
index 2dee5af..2b4c745 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/user/user.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/user/user.js
@@ -8,7 +8,7 @@
layerIndex: -1,
deptid:0
};
-var language =$("#language").val()
+var language =1
/**
* 初始化表格的列
*/
@@ -87,9 +87,9 @@
if(row.statusName != '' && row.statusName != null) {
if(language==1){
if (row.statusName == "2"){
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;color: red;" title="' + `冻结` + '" onfocus="AppUserInfo.tooltip()">' + 冻结 + '</p>']
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;color: red;" title="' + `冻结` + '" onfocus="AppUserInfo.tooltip()">' + `冻结` + '</p>']
}else{
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + `启用` + '" onfocus="AppUserInfo.tooltip()">' + 启用 + '</p>']
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + `启用` + '" onfocus="AppUserInfo.tooltip()">' + `启用` + '</p>']
}
}else if(language==2){
if (row.statusName == "2"){
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
index b5eb976..375d74c 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
@@ -122,7 +122,7 @@
StoreInfo info = new StoreInfo();
info.setStoreId(store.getId());
info.setStoreName(store.getName());
- info.setStoreImg(store.getRealPicture());
+ info.setStoreImg(store.getCoverDrawing());
info.setDistance(l);
info.setStoreAddr(store.getAddress());
info.setLatitude(storeLat);
--
Gitblit v1.7.1