Skip to content

G
gdtel-gztel-school-center
Commit 2020ecaa by 罗承锋
Options

修改合伙人权限

parent d60f47ad
Showing with 196 additions and 106 deletions
common/src/main/java/com/winsun/bean/BroadBandOrder.java
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotations.TableField;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class BroadBandOrder extends Order{
......@@ -146,6 +147,8 @@ public class BroadBandOrder extends Order{
private String successTimeEnd;
private List<Integer> hehuorenIds;
private Integer pageNo;
private Integer pageSize;
......
common/src/main/java/com/winsun/service/IHhrUserService.java 0 → 100644
package com.winsun.service;
import com.baomidou.mybatisplus.service.IService;
import com.winsun.bean.HhrUser;
import java.util.List;
/**
* 用户操作
* @author chengfengluo
* @date 2021-03-11 15:00
*/
public interface IHhrUserService extends IService<HhrUser> {
/**
* 获取管辖内用户id
* @return
*/
List<Integer> getUserIds (Integer userId, List<String> roles);
}
common/src/main/java/com/winsun/service/impl/HhrUserServiceImpl.java 0 → 100644
package com.winsun.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.winsun.bean.HhrSupervisorSchool;
import com.winsun.bean.HhrUser;
import com.winsun.bean.UserSchool;
import com.winsun.mapper.HhrSupervisorSchoolMapper;
import com.winsun.mapper.HhrUserMapper;
import com.winsun.mapper.UserSchoolMapper;
import com.winsun.service.IHhrUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* @author chengfengluo
* @date 2021-03-11 15:01
*/
@Service
public class HhrUserServiceImpl extends ServiceImpl<HhrUserMapper, HhrUser> implements IHhrUserService {
@Autowired
private HhrSupervisorSchoolMapper hhrSupervisorSchoolMapper;
@Autowired
private UserSchoolMapper userSchoolMapper;
/**
* 获取管辖内用户id
* @return
*/
public List<Integer> getUserIds (Integer userId, List<String> roles) {
List<Integer> resultList = new ArrayList<>();
StringBuffer sb = new StringBuffer();
for(String role : roles) {
sb.append(role).append(",");
}
// 职位信息
HhrUser hhrUser = this.selectById(userId);
String rolesStr = sb.toString();
if (rolesStr.indexOf("超级管理员") != -1 || rolesStr.indexOf("快递公司") != -1) {
// 快递公司另做权限
return resultList;
}else if(rolesStr.indexOf("县分管理员（订单）") != -1 || "总经理".equals(hhrUser.getPosition())){
// 县分管理员、督导(查询管辖内的学校用户)
resultList = this.getSubNameUser(userId);
}else if(rolesStr.indexOf("合伙人") != -1 && "楼长".equals(hhrUser.getPosition())) {
// 合伙人（楼长，查询本人及下级信息）
resultList = this.getChildrenUser(userId);
}else{
// 合伙人（成员，查询本人信息）其他人员
}
resultList.add(userId);
return resultList;
}
/**
* 获取所有用户
* @param userId
* @return
*/
public List<Integer> getAllUser(Integer userId) {
Wrapper<HhrUser> wrapper = new EntityWrapper<>();
wrapper.setSqlSelect("id");
wrapper.isNotNull("id");
List<HhrUser> hhrUsers = this.selectList(wrapper);
List<Integer> resultList = new ArrayList<>();
hhrUsers.forEach(hhrUser -> {
resultList.add(Integer.parseInt(hhrUser.getId()));
});
return resultList;
}
/**
* 获取县分用户
* @param userId
* @return
*/
public List<Integer> getSubNameUser(Integer userId) {
Wrapper<HhrSupervisorSchool> wrapper = new EntityWrapper<>();
wrapper.eq("user_id", userId);
List<HhrSupervisorSchool> hhrSupervisorSchools = hhrSupervisorSchoolMapper.selectList(wrapper);
if (hhrSupervisorSchools == null || hhrSupervisorSchools.size() == 0) {
return new ArrayList<>();
}
String[] school = new String[hhrSupervisorSchools.size()];
for(int i = 0; i < hhrSupervisorSchools.size(); ++i) {
school[i] = hhrSupervisorSchools.get(i).getSchool();
}
Wrapper<UserSchool> userSchoolWrapper = new EntityWrapper<>();
userSchoolWrapper.in("school_id", school);
List<UserSchool> userSchools = userSchoolMapper.selectList(userSchoolWrapper);
List<Integer> resultList = new ArrayList<>();
userSchools.forEach(userSchool -> {
resultList.add(Integer.parseInt(userSchool.getUserId()));
});
return resultList;
}
/**
* 获取子用户
* @param userId
* @return
*/
public List<Integer> getChildrenUser(Integer userId) {
Wrapper<HhrUser> wrapper = new EntityWrapper<>();
wrapper.like("parent_ids", userId + "");
List<HhrUser> hhrUsers = this.selectList(wrapper);
List<Integer> resultList = new ArrayList<>();
hhrUsers.forEach(hhrUser -> {
resultList.add(Integer.parseInt(hhrUser.getId()));
});
return resultList;
}
}
common/src/main/resources/com/winsun/mapper/mapping/OrderMapper.xml
......@@ -117,10 +117,10 @@
and create_time &lt;= #{createTimeEnd}
</if>
<if test="successTimeStart != null and successTimeStart != ''">
and success_time = &gt;= #{successTimeStart}
and success_time &gt;= #{successTimeStart}
</if>
<if test="successTimeEnd != null and successTimeEnd != ''">
and success_time = &lt;= #{successTimeEnd}
and success_time &lt;= #{successTimeEnd}
</if>
<if test="userType != null and userType != ''">
and user_type = #{userType}
......@@ -152,6 +152,12 @@
<if test="orderId != null and orderId != ''">
and order_id = #{orderId}
</if>
<if test="hehuorenIds != null and hehuorenIds.size > 0">
and hehuoren_id in
<foreach collection="hehuorenIds" item="hehuorenId" open="(" close=")" separator=",">
#{hehuorenId}
</foreach>
</if>
) ho,order_view ov
where
ho.kd_order_id = ov.orderSeq
......
core-service/src/main/java/com/winsun/item/modular/system/controller/LoginPwdController.java
......@@ -731,10 +731,10 @@ public class LoginPwdController extends BaseController {
sysUser.setPhone(phone);
sysUser.setSalt(ShiroKit.getRandomSalt(5));
sysUser.setSubstName(substName);
sysUser.setRoleid("251"); // 成员
sysUser.setRoleid("243"); // 合伙人
sysUser.setDeptid("24"); // 广州分公司
sysUser.setCreatetime(new Date());
sysUser.setStatus("2");
sysUser.setStatus("4");
sysUser.setPassword(ShiroKit.md5(password, sysUser.getSalt()));
sysUser.setOldPassward(ShiroKit.md5(password, sysUser.getSalt()));
insert += sysUserMapper.insert(sysUser);
......
service-manager/src/main/java/com/winsun/controller/AnalysisController.java
......@@ -15,6 +15,7 @@ import com.winsun.mapper.HhrUserMapper;
import com.winsun.mapper.SysUserMapper;
import com.winsun.mapper.UserSchoolMapper;
import com.winsun.service.AccessStatisticService;
import com.winsun.service.IHhrUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -43,16 +44,20 @@ public class AnalysisController extends BaseController {
private AccessStatisticService accessStatisticService;
private IHhrUserService hhrUserService;
@Autowired
public AnalysisController(SysUserMapper sysUserMapper, HhrUserMapper hhrUserMapper,
HhrSupervisorSchoolMapper hhrSupervisorSchoolMapper,
UserSchoolMapper userSchoolMapper,
AccessStatisticService accessStatisticService) {
AccessStatisticService accessStatisticService,
IHhrUserService hhrUserService) {
this.sysUserMapper = sysUserMapper;
this.hhrUserMapper = hhrUserMapper;
this.hhrSupervisorSchoolMapper = hhrSupervisorSchoolMapper;
this.userSchoolMapper = userSchoolMapper;
this.accessStatisticService = accessStatisticService;
this.hhrUserService = hhrUserService;
}
/**
......@@ -87,7 +92,7 @@ public class AnalysisController extends BaseController {
ShiroUser shiroUser = getShiroUser();
Integer id = shiroUser.getId();
List<Integer> userIds = getUserIds(shiroUser.getId(), shiroUser.getRoleNames());
List<Integer> userIds = hhrUserService.getUserIds(shiroUser.getId(), shiroUser.getRoleNames());
String today, toWeekStart, toWeekEnd, toMonthStart, toMonthEnd;
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
......@@ -133,7 +138,7 @@ public class AnalysisController extends BaseController {
// 判断身份
ShiroUser shiroUser = getShiroUser();
log.info("获取当前登录信息" + JSON.toJSONString(shiroUser));
List<Integer> userIds = getUserIds(shiroUser.getId(), shiroUser.getRoleNames());
List<Integer> userIds = hhrUserService.getUserIds(shiroUser.getId(), shiroUser.getRoleNames());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Map<String, Object> pvStatisticsEchartData = null;
try {
......@@ -152,7 +157,7 @@ public class AnalysisController extends BaseController {
// 判断身份
ShiroUser shiroUser = getShiroUser();
log.info("获取当前登录信息" + JSON.toJSONString(shiroUser));
List<Integer> userIds = getUserIds(shiroUser.getId(), shiroUser.getRoleNames());
List<Integer> userIds = hhrUserService.getUserIds(shiroUser.getId(), shiroUser.getRoleNames());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
// 督导查询合伙人id去匹配
Map<String, Object> uvStatisticsEchartData = null;
......@@ -166,93 +171,4 @@ public class AnalysisController extends BaseController {
return ResponseData.success(uvStatisticsEchartData);
}
/**
* 获取管辖内用户id
* @return
*/
public List<Integer> getUserIds (Integer userId, List<String> roles) {
List<Integer> resultList = new ArrayList<>();
StringBuffer sb = new StringBuffer();
for(String role : roles) {
sb.append(role);
}
String rolesStr = sb.toString();
if (rolesStr.indexOf("超级管理员") != -1) {
return resultList;
}else if(rolesStr.indexOf("县分管理员") != -1){
// 县分管理员(查询管辖内的学校用户)
resultList = this.getSubNameUser(userId);
}else if(rolesStr.indexOf("督导") != -1 || rolesStr.indexOf("楼长") != -1) {
// 合伙人（督导、楼长，查询本人及下级信息）
resultList = this.getChildrenUser(userId);
}else{
// 合伙人（成员，查询本人信息）
}
resultList.add(userId);
return resultList;
}
/**
* 获取所有用户
* @param userId
* @return
*/
public List<Integer> getAllUser(Integer userId) {
Wrapper<HhrUser> wrapper = new EntityWrapper<>();
wrapper.setSqlSelect("id");
wrapper.isNotNull("id");
List<HhrUser> hhrUsers = hhrUserMapper.selectList(wrapper);
List<Integer> resultList = new ArrayList<>();
hhrUsers.forEach(hhrUser -> {
resultList.add(Integer.parseInt(hhrUser.getId()));
});
return resultList;
}
/**
* 获取县分用户
* @param userId
* @return
*/
public List<Integer> getSubNameUser(Integer userId) {
Wrapper<HhrSupervisorSchool> wrapper = new EntityWrapper<>();
wrapper.eq("user_id", userId);
List<HhrSupervisorSchool> hhrSupervisorSchools = hhrSupervisorSchoolMapper.selectList(wrapper);
if (hhrSupervisorSchools == null || hhrSupervisorSchools.size() == 0) {
return new ArrayList<>();
}
String[] school = new String[hhrSupervisorSchools.size()];
for(int i = 0; i < hhrSupervisorSchools.size(); ++i) {
school[i] = hhrSupervisorSchools.get(i).getSchool();
}
Wrapper<UserSchool> userSchoolWrapper = new EntityWrapper<>();
userSchoolWrapper.in("school_id", school);
List<UserSchool> userSchools = userSchoolMapper.selectList(userSchoolWrapper);
List<Integer> resultList = new ArrayList<>();
userSchools.forEach(userSchool -> {
resultList.add(Integer.parseInt(userSchool.getUserId()));
});
return resultList;
}
/**
* 获取子用户
* @param userId
* @return
*/
public List<Integer> getChildrenUser(Integer userId) {
Wrapper<HhrUser> wrapper = new EntityWrapper<>();
wrapper.like("parent_ids", userId + "");
List<HhrUser> hhrUsers = hhrUserMapper.selectList(wrapper);
List<Integer> resultList = new ArrayList<>();
hhrUsers.forEach(hhrUser -> {
resultList.add(Integer.parseInt(hhrUser.getId()));
});
return resultList;
}
}
service-manager/src/main/java/com/winsun/controller/NewUserController.java
......@@ -80,7 +80,7 @@ public class NewUserController extends BaseController {
@Permission(menuname = "修改新用户审核信息", value = "update", method = RequestMethod.POST)
public ResponseData<String> updateProduct(@RequestParam("ids") String ids,@RequestParam("status") String status) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "县分管理员（订单）"))) {
return ResponseData.error("无数据权限");
}
List<String> list1 = Arrays.asList(ids.split(",")); //[a, b, c]
......@@ -119,7 +119,7 @@ public class NewUserController extends BaseController {
@RequestParam(name = "pageNo") int pageNo,
@RequestParam(name = "pageSize") int pageSize) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "县分管理员（订单）"))) {
return ResponseData.error("无数据权限");
}
Page<Map<String,Object>> page = new Page<>(pageNo, pageSize);
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
......@@ -18,6 +18,7 @@ import com.winsun.bean.*;
import com.winsun.constant.FilePath;
import com.winsun.mapper.*;
import com.winsun.rabbitmq.RabbitProducer;
import com.winsun.service.IHhrUserService;
import com.winsun.smsUtils.SendSmsAndMail;
import com.winsun.utils.Constant;
import com.winsun.utils.*;
......@@ -124,6 +125,9 @@ public class OrderController extends BaseController {
@Autowired
private SalesListController salesListController;
@Autowired
private IHhrUserService hhrUserService;
private InputStream in = this.getClass().getResourceAsStream("/txtfiledetail.properties");
private Properties prop = new Properties();
......@@ -333,6 +337,8 @@ public class OrderController extends BaseController {
}
// 添加操作记录
appMapper.inserOrderHis(sendTypeOrder.getId(), "送货上门中", new Date(), user.getName());
}else{
ResponseData.error("请先填写配送方式");
}
return ResponseData.success("更新iccid成功！");
}
......@@ -424,7 +430,6 @@ public class OrderController extends BaseController {
* @return
*/
@Permission(menuname = "查询订单信息", value = "list", method = RequestMethod.POST)
//@RequestMapping(value="list", method = RequestMethod.POST)
public Map<String,Object> listOrder(
@RequestParam(name = "createTimeStart", required = false) String createTimeStart,
@RequestParam(name = "createTimeEnd", required = false) String createTimeEnd,
......@@ -436,6 +441,7 @@ public class OrderController extends BaseController {
@RequestParam(name = "hehuorenSchool", required = false) String hehuorenSchool, @RequestParam(name = "hehuorenName", required = false) String hehuorenName,
@RequestParam(name = "orderStatus", required = false) String orderStatus,@RequestParam(name = "hehuorenArea", required = false) String hehuorenArea,
@RequestParam(name = "customerName", required = false) String customerName, @RequestParam(name = "pageNo", required = false) int pageNo,
@RequestParam(name = "orderId", required = false)String orderId,@RequestParam(name = "xbOrderId", required = false) String xbOrderId,
@RequestParam(name = "pageSize", required = false) int pageSize) {
Map<String,Object> map = new HashMap<>();
......@@ -445,9 +451,15 @@ public class OrderController extends BaseController {
return map;
}
// 添加权限
// 添加查询权限
List<Integer> userIds = hhrUserService.getUserIds(user.getId(), user.getRoleNames());
Wrapper<Order> wrapper = new EntityWrapper();
if (userIds.size() != 0) {
wrapper.in("hehuoren_id", userIds);
}
wrapper.isNull("kd_order_id");
wrapper.notIn("user_type",3,5,9,10);
wrapper.ge(StringUtils.isNotBlank(createTimeStart), "create_time", createTimeStart);
......@@ -456,11 +468,13 @@ public class OrderController extends BaseController {
wrapper.le(StringUtils.isNotBlank(successTimeEnd), "success_time", successTimeEnd);
wrapper.eq(StringUtils.isNotBlank(userType), "user_type", userType);
wrapper.eq(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber);
wrapper.eq(StringUtils.isNotBlank(orderId),"order_id", orderId);
wrapper.eq(StringUtils.isNotBlank(xbOrderId), "xb_order_id", xbOrderId);
//wrapper.eq(StringUtils.isNotBlank(kapin), "kapin", kapin);
wrapper.eq(StringUtils.isNotBlank(customerName), "customer_name", customerName);
wrapper.eq(StringUtils.isNotBlank(businessNumber), "business_number", businessNumber);
wrapper.eq(StringUtils.isNotBlank(contactNumber), "contact_number", contactNumber);
wrapper.eq(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool);
wrapper.like(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool);
wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName, SqlLike.DEFAULT);
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) {
wrapper.eq("hehuoren_area", "本部");
......@@ -479,7 +493,7 @@ public class OrderController extends BaseController {
Page<Order> page = new Page<>(pageNo, pageSize);
List<Order> aPackage = orderMapper.selectPage(page, wrapper);
page.setRecords(aPackage);
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "楼长","受理人员"))) {
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "楼长","成员","受理人员"))) {
map.put("isAbnormal",false);
}else {
map.put("isAbnormal",true);
......@@ -502,10 +516,16 @@ public class OrderController extends BaseController {
public ResponseData<Page<BroadBandOrder>> getBroadBandOrder(BroadBandOrder broadBandOrder) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "县分管理员（订单）", "修改身份证", "合伙人"))) {
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员", "县分管理员（订单）", "修改身份证", "合伙人"))) {
ResponseData.error("无权限查询订单");
}
List<Integer> userIds = hhrUserService.getUserIds(user.getId(), user.getRoleNames());
if (userIds.size() != 0) {
broadBandOrder.setHehuorenIds(userIds);
}
Page<BroadBandOrder> page = new Page<>(broadBandOrder.getPageNo(), broadBandOrder.getPageSize());
broadBandOrder.setPageStart((broadBandOrder.getPageNo() - 1) * broadBandOrder.getPageSize());
List<BroadBandOrder> broadBandOrders = orderMapper.selectBroadBandOrderList(page, broadBandOrder);
......
service-manager/src/main/java/com/winsun/controller/PartnerController.java
......@@ -74,8 +74,8 @@ public class PartnerController extends BaseController {
@RequestParam(name = "parentIds", required = false) String parentIds) {
SysUser user = sysUserMapper.selectById(id);
password = StringUtils.isNotBlank(password) ? MD5Utils.md5(password, user.getSalt()) : user.getPassword();
parentId = !"null".equals(parentId) ? parentId : "";
parentIds = !"null".equals(parentIds) ? parentIds : "";
parentId = null == parentId ? "" : parentId.replaceAll("null", "");
parentIds = null == parentIds ? "" : parentIds.replaceAll("null", "");
if (StringUtils.isBlank(ysm)) {
ysm = "1";
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment