Merge remote-tracking branch 'origin/master'

purchase-admin/src/main/java/com/ozs/web/controller/system/SysDictDataController.java

@@ -79,6 +79,7 @@ public class SysDictDataController extends BaseController
     /**
      * 根据字典类型查询字典数据信息
      */
+    @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/type/{dictType}")
     @ApiOperation("根据字典类型查询字典数据信息")
     public AjaxResult dictType(@PathVariable String dictType)

purchase-admin/src/main/java/com/ozs/web/controller/system/SysMenuController.java

@@ -63,6 +63,7 @@ public class SysMenuController extends BaseController
     /**
      * 获取菜单下拉树列表
      */
+    @PreAuthorize("@ss.hasPermi('system:menu:tree')")
     @GetMapping("/treeselect")
     @ApiOperation("获取菜单下拉树列表")
     public AjaxResult treeselect(SysMenu menu)
@@ -74,6 +75,7 @@ public class SysMenuController extends BaseController
     /**
      * 加载对应角色菜单列表树
      */
+    @PreAuthorize("@ss.hasPermi('system:menu:treeList')")
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
     @ApiOperation("加载对应角色菜单列表树")
     public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)

purchase-admin/src/main/java/com/ozs/web/controller/system/SysProcurementStandardController.java

@@ -13,6 +13,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -39,6 +40,7 @@ public class SysProcurementStandardController {
     @Resource
     private SysProcurementStandardService sysProcurementStandardService;
 
+    @PreAuthorize("@ss.hasPermi('system:dept:addSysProcurementStandar')")
     @ApiOperation("添加采购单位管理中标准信息")
     @PostMapping("save")
     public R<String> save(@RequestBody List<SysProcurementStandardVo> sysProcurementStandardVoList) {
@@ -54,6 +56,7 @@ public class SysProcurementStandardController {
         return R.ok();
     }
 
+    @PreAuthorize("@ss.hasPermi('system:dept:updateSysProcurementStandar')")
     @ApiOperation("修改采购单位管理中标准信息")
     @PostMapping("update")
     public R<String> update(@RequestBody List<SysProcurementStandardVo> sysProcurementStandardVoList) {

purchase-admin/src/main/java/com/ozs/web/controller/system/SysRoleController.java

@@ -1,30 +1,20 @@
 package com.ozs.web.controller.system;
 
-import java.net.UnknownHostException;
 import java.util.List;
-import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ozs.base.domain.BasePolicy;
-import com.ozs.base.vo.BasePolicyPageReqVo;
-import com.ozs.common.constant.ModularConstans;
-import com.ozs.common.core.domain.R;
-import com.ozs.common.utils.file.FileUtils;
-import com.ozs.common.vo.EsMessage;
 import com.ozs.system.domain.vo.requestVo.SysMenuIdsRequestVo;
 import com.ozs.system.domain.vo.requestVo.SysRoleRequestVo;
 import com.ozs.system.domain.vo.requestVo.SysStatusRequestVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.lucene.search.similarities.Distribution;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -93,8 +83,17 @@ public class SysRoleController extends BaseController
     @ApiOperation("根据条件分页查询角色数据")
     public AjaxResult page(@NotEmpty(message = "数据为空")
                            @RequestBody SysRoleRequestVo vo) {
-        LambdaQueryWrapper<SysRole> lw = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<SysRole> lw = new LambdaQueryWrapper<SysRole>();
         lw.eq(SysRole::getDelFlag,0);
+        if (!StringUtils.isBlank(vo.getRoleName())) {
+            lw.like(SysRole::getRoleName, "%" +vo.getRoleName() + "%");
+        }
+        if (!StringUtils.isBlank(vo.getRoleKey())) {
+            lw.like(SysRole::getRoleKey, "%" +vo.getRoleKey() + "%");
+        }
+        if (!StringUtils.isBlank(vo.getStatus())) {
+            lw.eq(SysRole::getStatus, vo.getStatus());
+        }
         IPage<SysRole> page = roleService.page(new Page<>(vo.getPageNum(), vo.getPageSize()), lw);
         return success(page);
 
@@ -160,7 +159,8 @@ public class SysRoleController extends BaseController
         sysRole.setCreateBy(getUsername());
         return toAjax(roleService.addRole(sysRole));
     }
-
+    
+    @PreAuthorize("@ss.hasPermi('system:role:addDistribution')")
     @PostMapping("/saveDistributionModule")
     @ApiOperation("新增分配模块")
     public AjaxResult saveDistributionModule(@RequestBody SysMenuIdsRequestVo sysMenuIdsRequestVo)
@@ -240,7 +240,8 @@ public class SysRoleController extends BaseController
         roleService.checkRoleDataScope(role.getRoleId());
         return toAjax(roleService.authDataScope(role));
     }
-
+    
+    @PreAuthorize("@ss.hasPermi('system:role:editDistribution')")
     @PostMapping("/updateDistributionModule")
     @ApiOperation("修改分配模块")
     public AjaxResult updateDistributionModule(@RequestBody SysMenuIdsRequestVo sysMenuIdsRequestVo)

purchase-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -8,6 +8,9 @@ import javax.servlet.http.HttpServletResponse;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ozs.common.constant.Constants;
+import com.ozs.common.core.domain.entity.SysDictData;
+import com.ozs.home.domain.HomeNotice;
 import com.ozs.system.domain.vo.requestVo.SysUserPageRequestVo;
 import com.ozs.system.domain.vo.requestVo.SysUserRequestVo;
 import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
@@ -66,6 +69,8 @@ public class SysUserController extends BaseController
 
     @Autowired
     private ISysPostService postService;
+    @Autowired
+    private ISysDeptService iSysDeptService;
 
 //    /**
 //     * 获取用户列表
@@ -88,9 +93,28 @@ public class SysUserController extends BaseController
     @ApiOperation("获取用户列表")
     public AjaxResult list(@RequestBody SysUserPageRequestVo sysUserPageRequestVo)
     {
-        LambdaQueryWrapper<SysUser> lw = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<SysUser> lw = new LambdaQueryWrapper<SysUser>();
         lw.eq(SysUser::getDelFlag,0);
+        if (!StringUtils.isBlank(sysUserPageRequestVo.getNickName())) {
+            lw.like(SysUser::getNickName, "%" + sysUserPageRequestVo.getNickName() + "%");
+        }
+        if (!StringUtils.isBlank(sysUserPageRequestVo.getDeptId())) {
+            lw.eq(SysUser::getDeptId, sysUserPageRequestVo.getDeptId());
+        }
         IPage<SysUser> page = userService.page(new Page<>(sysUserPageRequestVo.getPageNum(), sysUserPageRequestVo.getPageSize()), lw);
+        if (!ObjectUtils.isEmpty(page.getRecords())) {
+            page.setRecords(page.getRecords().stream().map(dto -> {
+                // 采购单位名称
+                Map<String, Object> stringObjectMap = iSysDeptService.selectDeptById(dto.getDeptId());
+                if (!ObjectUtils.isEmpty(stringObjectMap)) {
+                    SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) stringObjectMap.get("sysDept");
+                    SysDept sysDept = new SysDept();
+                    sysDept.setDeptName(sysDeptResponseVo.getDeptName());
+                    dto.setDept(sysDept);
+                }
+                return dto;
+            }).collect(Collectors.toList()));
+        }
         if(!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())){
             List<SysUser> dto1 = page.getRecords().stream().map(o -> {
                 Map<String, Object> stringObjectMap = deptService.selectDeptById(o.getDeptId());

purchase-system/src/main/java/com/ozs/system/domain/vo/requestVo/SysRoleRequestVo.java

@@ -13,6 +13,7 @@ public class SysRoleRequestVo extends PageVo implements Serializable {
     private static final long serialVersionUID = 1L;
     private String roleName;
     private String status;
+    private String  roleKey;
     private String roleRemarks;
     private Long roleId;
 }

purchase-system/src/main/java/com/ozs/system/domain/vo/requestVo/SysUserPageRequestVo.java

@@ -12,5 +12,5 @@ import java.io.Serializable;
 public class SysUserPageRequestVo extends PageVo implements Serializable {
     private static final long serialVersionUID = 1L;
     private String nickName;
-    private Long deptId;
+    private String deptId;
 }