Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/purchase

pom.xml

@@ -30,7 +30,7 @@
         <poi.version>4.1.2</poi.version>
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
-        <mybatis-plus.version>3.4.3.4</mybatis-plus.version>
+        <mybatis-plus.version>3.5.1</mybatis-plus.version>
     </properties>
 
     <!-- 依赖声明 -->

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseAgencyController.java

@@ -1,6 +1,7 @@
 package com.ozs.web.controller.base;
 
 
+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.BaseAgency;
@@ -12,6 +13,7 @@ import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.enums.BusinessType;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.ObjectUtils;
@@ -100,7 +102,17 @@ public class BaseAgencyController extends BaseController {
     @PreAuthorize("@ss.hasPermi('base:agency:list')")
     @Log(title = "招标代理机构管理", businessType = BusinessType.QUERY)
     public AjaxResult page(@NotEmpty(message = "数据为空") @RequestBody BaseAgentPageReqVo vo) {
-        IPage<BaseAgency> page = baseAgencyService.page(new Page<BaseAgency>(vo.getPageNum(), vo.getPageSize()), vo);
+        LambdaQueryWrapper<BaseAgency> lw = new LambdaQueryWrapper<BaseAgency>();
+        if(!StringUtils.isBlank(vo.getCompanyName())){
+            lw.like(BaseAgency::getCompanyName,vo.getCompanyName());
+        }
+        if(!StringUtils.isBlank(vo.getCompanyNature())){
+            lw.eq(BaseAgency::getCompanyNature,vo.getCompanyNature());
+        }
+        if(!ObjectUtils.isEmpty(vo.getStatus())){
+            lw.eq(BaseAgency::getStatus,vo.getStatus());
+        }
+        IPage<BaseAgency> page = baseAgencyService.page(new Page<BaseAgency>(vo.getPageNum(), vo.getPageSize()), lw);
         return success(page);
     }
 }

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

@@ -43,7 +43,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
-    @ApiOperation("获取参数配置列表")
+    @ApiOperation("获取部门列表")
     public AjaxResult list(SysDept dept)
     {
         List<SysDept> depts = deptService.selectDeptList(dept);

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

@@ -3,8 +3,15 @@ package com.ozs.web.controller.system;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ozs.common.core.domain.R;
+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.validation.annotation.Validated;
@@ -96,59 +103,105 @@ public class SysRoleController extends BaseController
     /**
      * 新增角色
      */
+//    @PreAuthorize("@ss.hasPermi('system:role:add')")
+//    @Log(title = "角色管理", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    @ApiOperation("新增角色")
+//    public AjaxResult add(@Validated @RequestBody SysRole role)
+//    {
+//        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+//        {
+//            return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+//        }
+//        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+//        {
+//            return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+//        }
+//        role.setCreateBy(getUsername());
+//        return toAjax(roleService.insertRole(role));
+//
+//    }
+
     @PreAuthorize("@ss.hasPermi('system:role:add')")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("新增角色")
-    public AjaxResult add(@Validated @RequestBody SysRole role)
+    public AjaxResult add(@Validated @RequestBody SysRoleRequestVo sysRoleRequestVo)
     {
-        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+        SysRole sysRole = new SysRole();
+        BeanUtils.copyProperties(sysRoleRequestVo,sysRole);
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(sysRole)))
         {
-            return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+            return error("新增角色'" + sysRole.getRoleName() + "'失败，角色名称已存在");
         }
-        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
-        {
-            return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
-        }
-        role.setCreateBy(getUsername());
-        return toAjax(roleService.insertRole(role));
+        sysRole.setCreateBy(getUsername());
+        return toAjax(roleService.addRole(sysRole));
+    }
 
+    @PostMapping("/saveDistributionModule")
+    @ApiOperation("新增分配模块")
+    public AjaxResult saveDistributionModule(@RequestBody SysMenuIdsRequestVo sysMenuIdsRequestVo)
+    {
+        return toAjax(roleService.distributionModule(sysMenuIdsRequestVo));
     }
 
+//    /**
+//     * 修改保存角色
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+//    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    @ApiOperation("修改保存角色")
+//    public AjaxResult edit(@Validated @RequestBody SysRole role)
+//    {
+//        roleService.checkRoleAllowed(role);
+//        roleService.checkRoleDataScope(role.getRoleId());
+//        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+//        {
+//            return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+//        }
+//        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+//        {
+//            return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+//        }
+//        role.setUpdateBy(getUsername());
+//
+//        if (roleService.updateRole(role) > 0)
+//        {
+//            // 更新缓存用户权限
+//            LoginUser loginUser = getLoginUser();
+//            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
+//            {
+//                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
+//                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+//                tokenService.setLoginUser(loginUser);
+//            }
+//            return success();
+//        }
+//        return error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+//    }
+
     /**
      * 修改保存角色
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PutMapping("/edit")
     @ApiOperation("修改保存角色")
-    public AjaxResult edit(@Validated @RequestBody SysRole role)
+    public AjaxResult edit(@Validated @RequestBody SysRoleRequestVo sysRoleRequestVo)
     {
+        SysRole role = new SysRole();
+        BeanUtils.copyProperties(sysRoleRequestVo,role);
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
         if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
         {
             return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
         }
-        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
-        {
-            return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
-        }
         role.setUpdateBy(getUsername());
 
-        if (roleService.updateRole(role) > 0)
-        {
-            // 更新缓存用户权限
-            LoginUser loginUser = getLoginUser();
-            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
-            {
-                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
-                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
-                tokenService.setLoginUser(loginUser);
-            }
-            return success();
-        }
-        return error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+        return toAjax(roleService.updateRoles(role));
+        
     }
 
     /**
@@ -165,19 +218,50 @@ public class SysRoleController extends BaseController
         return toAjax(roleService.authDataScope(role));
     }
 
+    @PostMapping("/updateDistributionModule")
+    @ApiOperation("修改分配模块")
+    public AjaxResult updateDistributionModule(@RequestBody SysMenuIdsRequestVo sysMenuIdsRequestVo)
+    {
+        if (roleService.updateDistributionModule(sysMenuIdsRequestVo) > 0)
+        {
+            // 更新缓存用户权限
+            LoginUser loginUser = getLoginUser();
+            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
+            {
+                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
+                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+                tokenService.setLoginUser(loginUser);
+            }
+            return success();
+        }
+        return error("修改失败，请联系管理员");
+    }
+
+//    /**
+//     * 状态修改
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+//    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+//    @PutMapping("/changeStatus")
+//    @ApiOperation("状态修改")
+//    public AjaxResult changeStatus(@RequestBody SysRole role)
+//    {
+//        roleService.checkRoleAllowed(role);
+//        roleService.checkRoleDataScope(role.getRoleId());
+//        role.setUpdateBy(getUsername());
+//        return toAjax(roleService.updateRoleStatus(role));
+//    }
+
     /**
      * 状态修改
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    @ApiOperation("状态修改")
-    public AjaxResult changeStatus(@RequestBody SysRole role)
+    @ApiOperation("批量状态修改")
+    public AjaxResult changeStatus(@RequestBody List<SysStatusRequestVo> sysStatusRequestVoList)
     {
-        roleService.checkRoleAllowed(role);
-        roleService.checkRoleDataScope(role.getRoleId());
-        role.setUpdateBy(getUsername());
-        return toAjax(roleService.updateRoleStatus(role));
+      return   toAjax(roleService.changeStatus(sysStatusRequestVoList));
     }
 
     /**

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

@@ -4,9 +4,11 @@ import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ozs.system.domain.vo.requestVo.SysUserRequestVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -126,6 +128,36 @@ public class SysUserController extends BaseController
         return ajax;
     }
 
+//    /**
+//     * 新增用户
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:user:add')")
+//    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    @ApiOperation("新增用户")
+//    public AjaxResult add(@Validated @RequestBody SysUser user)
+//    {
+//        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
+//        {
+//            return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+//        }
+//        else if (StringUtils.isNotEmpty(user.getPhonenumber())
+//                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+//        {
+//            return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+//        }
+//        else if (StringUtils.isNotEmpty(user.getEmail())
+//                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+//        {
+//            return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+//        }
+//        user.setCreateBy(getUsername());
+//        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+//        return toAjax(userService.insertUser(user));
+//    }
+    
+    
+
     /**
      * 新增用户
      */
@@ -133,8 +165,10 @@ public class SysUserController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("新增用户")
-    public AjaxResult add(@Validated @RequestBody SysUser user)
+    public AjaxResult add(@Validated @RequestBody SysUserRequestVo sysUserRequestVo)
     {
+        SysUser user = new SysUser();
+        BeanUtils.copyProperties(sysUserRequestVo,user);
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
         {
             return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
@@ -144,16 +178,40 @@ public class SysUserController extends BaseController
         {
             return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
         }
-        else if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
-            return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-        }
         user.setCreateBy(getUsername());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        return toAjax(userService.insertUser(user));
+        return toAjax(userService.saveUser(user));
     }
 
+//    /**
+//     * 修改用户
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+//    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    @ApiOperation("修改用户")
+//    public AjaxResult edit(@Validated @RequestBody SysUser user)
+//    {
+//        userService.checkUserAllowed(user);
+//        userService.checkUserDataScope(user.getUserId());
+//        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
+//        {
+//            return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
+//        }
+//        else if (StringUtils.isNotEmpty(user.getPhonenumber())
+//                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+//        {
+//            return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+//        }
+//        else if (StringUtils.isNotEmpty(user.getEmail())
+//                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+//        {
+//            return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+//        }
+//        user.setUpdateBy(getUsername());
+//        return toAjax(userService.updateUser(user));
+//    }
+
     /**
      * 修改用户
      */
@@ -161,28 +219,21 @@ public class SysUserController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation("修改用户")
-    public AjaxResult edit(@Validated @RequestBody SysUser user)
-    {
+    public AjaxResult edit(@Validated @RequestBody SysUserRequestVo sysUserRequestVo) {
+        SysUser user = new SysUser();
+        BeanUtils.copyProperties(sysUserRequestVo,user);
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
-        {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
             return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
-        }
-        else if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-        {
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
         }
-        else if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
-            return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-        }
         user.setUpdateBy(getUsername());
-        return toAjax(userService.updateUser(user));
+        return toAjax(userService.updateUsers(user));
     }
-
+    
     /**
      * 删除用户
      */

purchase-admin/src/main/resources/application.yml

@@ -10,4 +10,4 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: druid,dev
+    active: druid,test

purchase-common/src/main/java/com/ozs/common/core/domain/entity/SysDept.java

@@ -109,7 +109,7 @@ public class SysDept extends BaseEntity
         this.ancestors = ancestors;
     }
 
-    @NotBlank(message = "部门名称不能为空")
+//    @NotBlank(message = "部门名称不能为空")
     @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
     public String getDeptName()
     {
@@ -121,7 +121,7 @@ public class SysDept extends BaseEntity
         this.deptName = deptName;
     }
 
-    @NotNull(message = "显示顺序不能为空")
+//    @NotNull(message = "显示顺序不能为空")
     public Integer getOrderNum()
     {
         return orderNum;

purchase-common/src/main/java/com/ozs/common/core/domain/entity/SysRole.java

@@ -20,23 +20,25 @@ public class SysRole extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 角色ID */
-    @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
+//    @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
     private Long roleId;
 
     /** 角色名称 */
-    @Excel(name = "角色名称")
+//    @Excel(name = "角色名称")
     private String roleName;
 
     /** 角色权限 */
-    @Excel(name = "角色权限")
-    private String roleKey;
+//    @Excel(name = "角色权限")
+    private String  roleKey;
 
     /** 角色排序 */
-    @Excel(name = "角色排序")
+//    @Excel(name = "角色排序")
     private Integer roleSort;
+    
+    private String roleRemarks;
 
     /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
-    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
+//    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
     private String dataScope;
 
     /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
@@ -46,7 +48,7 @@ public class SysRole extends BaseEntity
     private boolean deptCheckStrictly;
 
     /** 角色状态（0正常 1停用） */
-    @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
+//    @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
     /** 删除标志（0代表存在 2代表删除） */
@@ -74,6 +76,14 @@ public class SysRole extends BaseEntity
         this.roleId = roleId;
     }
 
+    public String getRoleRemarks() {
+        return roleRemarks;
+    }
+
+    public void setRoleRemarks(String roleRemarks) {
+        this.roleRemarks = roleRemarks;
+    }
+
     public Long getRoleId()
     {
         return roleId;
@@ -94,7 +104,7 @@ public class SysRole extends BaseEntity
         return roleId != null && 1L == roleId;
     }
 
-    @NotBlank(message = "角色名称不能为空")
+//    @NotBlank(message = "角色名称不能为空")
     @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
     public String getRoleName()
     {
@@ -106,7 +116,7 @@ public class SysRole extends BaseEntity
         this.roleName = roleName;
     }
 
-    @NotBlank(message = "权限字符不能为空")
+//    @NotBlank(message = "权限字符不能为空")
     @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
     public String getRoleKey()
     {
@@ -118,7 +128,7 @@ public class SysRole extends BaseEntity
         this.roleKey = roleKey;
     }
 
-    @NotNull(message = "显示顺序不能为空")
+//    @NotNull(message = "显示顺序不能为空")
     public Integer getRoleSort()
     {
         return roleSort;
@@ -236,6 +246,7 @@ public class SysRole extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("roleRemarks",getRoleRemarks())
             .toString();
     }
 }

purchase-common/src/main/java/com/ozs/common/core/domain/entity/SysUser.java

@@ -142,7 +142,7 @@ public class SysUser extends BaseEntity
     }
 
     @Xss(message = "用户账号不能包含脚本字符")
-    @NotBlank(message = "用户账号不能为空")
+//    @NotBlank(message = "用户账号不能为空")
     @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
     public String getUserName()
     {

purchase-framework/src/main/java/com/ozs/framework/config/MybatisPlusConfig.java

@@ -1,26 +1,26 @@
-package com.ozs.framework.config;
-
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class MybatisPlusConfig{
-
-    @Bean
-    public MybatisPlusInterceptor mybatisPlusInterceptor() {
-        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
-        paginationInnerInterceptor.setOptimizeJoin(true);
-        paginationInnerInterceptor.setDbType(DbType.MYSQL);
-        paginationInnerInterceptor.setOverflow(true);
-        interceptor.addInnerInterceptor(paginationInnerInterceptor);
-        OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor = new OptimisticLockerInnerInterceptor();
-        interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor);
-        return interceptor;
-    }
-
-}
+//package com.ozs.framework.config;
+//
+//import com.baomidou.mybatisplus.annotation.DbType;
+//import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+//import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
+//import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+//@Configuration
+//public class MybatisPlusConfig{
+//
+//    @Bean
+//    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+//        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+//        PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+//        paginationInnerInterceptor.setOptimizeJoin(true);
+//        paginationInnerInterceptor.setDbType(DbType.MYSQL);
+//        paginationInnerInterceptor.setOverflow(true);
+//        interceptor.addInnerInterceptor(paginationInnerInterceptor);
+//        OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor = new OptimisticLockerInnerInterceptor();
+//        interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor);
+//        return interceptor;
+//    }
+//
+//}

purchase-system/src/main/java/com/ozs/base/service/BaseAgencyService.java

@@ -2,13 +2,15 @@ package com.ozs.base.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.base.domain.BaseAgency;
 import com.ozs.base.vo.BaseAgentPageReqVo;
+import com.ozs.common.core.domain.entity.SysProcurementStandard;
 
 /**
  * 代理机构
  */
-public interface BaseAgencyService {
+public interface BaseAgencyService  extends IService<BaseAgency> {
 
     int insert(BaseAgency baseAgency);
 
@@ -18,7 +20,7 @@ public interface BaseAgencyService {
 
     int operationBlacklist(BaseAgency baseAgency);
 
-    IPage<BaseAgency> page(Page<BaseAgency> baseAgencyPage, BaseAgentPageReqVo vo);
+//    IPage<BaseAgency> page(Page<BaseAgency> baseAgencyPage, BaseAgentPageReqVo vo);
 
     int remove(Long id);
 }

purchase-system/src/main/java/com/ozs/base/service/impl/BaseAgencyServiceImpl.java

@@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.base.domain.BaseAgency;
 import com.ozs.base.mapper.BaseAgencyMapper;
 import com.ozs.base.service.BaseAgencyService;
 import com.ozs.base.vo.BaseAgentPageReqVo;
 import com.ozs.common.constant.HttpStatus;
+import com.ozs.common.core.domain.entity.SysProcurementStandard;
 import com.ozs.common.exception.base.BaseException;
+import com.ozs.system.mapper.SysProcurementStandardMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +23,7 @@ import java.util.Arrays;
 
 @Service
 @Slf4j
-public class BaseAgencyServiceImpl implements BaseAgencyService {
+public class BaseAgencyServiceImpl extends ServiceImpl<BaseAgencyMapper, BaseAgency> implements BaseAgencyService {
 
     @Autowired
     private BaseAgencyMapper baseAgencyMapper;
@@ -54,20 +57,21 @@ public class BaseAgencyServiceImpl implements BaseAgencyService {
         return baseAgencyMapper.update(null, lambdaUpdateWrapper);
     }
 
-    @Override
-    public IPage<BaseAgency> page(Page<BaseAgency> baseAgencyPage, BaseAgentPageReqVo vo) {
-        LambdaQueryWrapper<BaseAgency> lw = new LambdaQueryWrapper<BaseAgency>();
-        if(!StringUtils.isBlank(vo.getCompanyName())){
-            lw.like(BaseAgency::getCompanyName,vo.getCompanyName());
-        }
-        if(!StringUtils.isBlank(vo.getCompanyNature())){
-            lw.eq(BaseAgency::getCompanyNature,vo.getCompanyNature());
-        }
-        if(!ObjectUtils.isEmpty(vo.getStatus())){
-            lw.eq(BaseAgency::getStatus,vo.getStatus());
-        }
-        return baseAgencyMapper.selectPage(baseAgencyPage,lw);
-    }
+//    @Override
+//    public IPage<BaseAgency> page(Page<BaseAgency> baseAgencyPage, BaseAgentPageReqVo vo) {
+//        LambdaQueryWrapper<BaseAgency> lw = new LambdaQueryWrapper<BaseAgency>();
+//        if(!StringUtils.isBlank(vo.getCompanyName())){
+//            lw.like(BaseAgency::getCompanyName,vo.getCompanyName());
+//        }
+//        if(!StringUtils.isBlank(vo.getCompanyNature())){
+//            lw.eq(BaseAgency::getCompanyNature,vo.getCompanyNature());
+//        }
+//        if(!ObjectUtils.isEmpty(vo.getStatus())){
+//            lw.eq(BaseAgency::getStatus,vo.getStatus());
+//        }
+//        return baseAgencyMapper.selectPage(baseAgencyPage, lw);
+//
+//    }
 
     @Override
     public int remove(Long id) {

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

@@ -0,0 +1,18 @@
+package com.ozs.system.domain.vo.requestVo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 分配模块使用的入参
+ * @author Administrator
+ */
+@Data
+public class SysMenuIdsRequestVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 菜单组 */
+    private Long[] menuIds;
+    private Long roleId;
+}

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

@@ -0,0 +1,13 @@
+package com.ozs.system.domain.vo.requestVo;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ */
+public class SysRoleRequestVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String roleName;
+    private String status;
+    private String roleRemarks;
+}

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

@@ -0,0 +1,13 @@
+package com.ozs.system.domain.vo.requestVo;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * 修改状态
+ */
+@Data
+public class SysStatusRequestVo {
+    private Long Id;
+    private String status;
+}

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

@@ -0,0 +1,17 @@
+package com.ozs.system.domain.vo.requestVo;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ */
+public class SysUserRequestVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String nickName;
+    private Long deptId;
+    private String userName;
+    private String password;
+    private String phonenumber;
+    private Long[] roleIds;
+    private Long userId;
+}

purchase-system/src/main/java/com/ozs/system/domain/vo/responseVo/UnitManagementResponseVo.java

@@ -1,7 +0,0 @@
-package com.ozs.system.domain.vo.responseVo;
-
-/**
- * @author Administrator
- */
-public class UnitManagementResponseVo {
-}

purchase-system/src/main/java/com/ozs/system/service/ISysRoleService.java

@@ -2,8 +2,12 @@ package com.ozs.system.service;
 
 import java.util.List;
 import java.util.Set;
+
+import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysRole;
 import com.ozs.system.domain.SysUserRole;
+import com.ozs.system.domain.vo.requestVo.SysMenuIdsRequestVo;
+import com.ozs.system.domain.vo.requestVo.SysStatusRequestVo;
 
 /**
  * 角色业务层
@@ -170,4 +174,40 @@ public interface ISysRoleService
      * @return 结果
      */
     public int insertAuthUsers(Long roleId, Long[] userIds);
+    /**
+     * 新增保存角色信息
+     *
+     * @param role 角色信息
+     * @return 结果
+     */
+    int addRole(SysRole role);
+
+    /**
+     * 新增分配模块
+     * @param sysMenuIdsRequestVo
+     * @return 
+     */
+    int distributionModule(SysMenuIdsRequestVo sysMenuIdsRequestVo);
+
+    /**
+     * 修改保存角色信息
+     *
+     * @param role 角色信息
+     * @return 结果
+     */
+    int updateRoles(SysRole role);
+
+    /**
+     * 修改分配模块
+     * @param sysMenuIdsRequestVo
+     * @return
+     */
+    int updateDistributionModule(SysMenuIdsRequestVo sysMenuIdsRequestVo);
+
+    /**
+     * 批量状态修改
+     * @param sysStatusRequestVoList
+     * @return
+     */
+    int changeStatus(List<SysStatusRequestVo> sysStatusRequestVoList);
 }

purchase-system/src/main/java/com/ozs/system/service/ISysUserService.java

@@ -203,4 +203,18 @@ public interface ISysUserService
      * @return 结果
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    /**
+     * 新增用户
+     * @param user
+     * @return
+     */
+    int saveUser(SysUser user);
+
+    /**
+     * 修改用户
+     * @param user
+     * @return
+     */
+    int updateUsers(SysUser user);
 }

purchase-system/src/main/java/com/ozs/system/service/impl/SysRoleServiceImpl.java

@@ -6,9 +6,12 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.system.domain.SysRoleDept;
 import com.ozs.system.domain.SysRoleMenu;
 import com.ozs.system.domain.SysUserRole;
+import com.ozs.system.domain.vo.requestVo.SysMenuIdsRequestVo;
+import com.ozs.system.domain.vo.requestVo.SysStatusRequestVo;
 import com.ozs.system.mapper.SysRoleMapper;
 import com.ozs.system.service.ISysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,8 +35,7 @@ import com.ozs.system.mapper.SysUserRoleMapper;
  * @author ruoyi
  */
 @Service
-public class SysRoleServiceImpl implements ISysRoleService
-{
+public class SysRoleServiceImpl implements ISysRoleService {
     @Autowired
     private SysRoleMapper roleMapper;
 
@@ -54,8 +56,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Override
     @DataScope(deptAlias = "d")
-    public List<SysRole> selectRoleList(SysRole role)
-    {
+    public List<SysRole> selectRoleList(SysRole role) {
         return roleMapper.selectRoleList(role);
     }
 
@@ -66,16 +67,12 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 角色列表
      */
     @Override
-    public List<SysRole> selectRolesByUserId(Long userId)
-    {
+    public List<SysRole> selectRolesByUserId(Long userId) {
         List<SysRole> userRoles = roleMapper.selectRolePermissionByUserId(userId);
         List<SysRole> roles = selectRoleAll();
-        for (SysRole role : roles)
-        {
-            for (SysRole userRole : userRoles)
-            {
-                if (role.getRoleId().longValue() == userRole.getRoleId().longValue())
-                {
+        for (SysRole role : roles) {
+            for (SysRole userRole : userRoles) {
+                if (role.getRoleId().longValue() == userRole.getRoleId().longValue()) {
                     role.setFlag(true);
                     break;
                 }
@@ -91,14 +88,11 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 权限列表
      */
     @Override
-    public Set<String> selectRolePermissionByUserId(Long userId)
-    {
+    public Set<String> selectRolePermissionByUserId(Long userId) {
         List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId);
         Set<String> permsSet = new HashSet<>();
-        for (SysRole perm : perms)
-        {
-            if (StringUtils.isNotNull(perm))
-            {
+        for (SysRole perm : perms) {
+            if (StringUtils.isNotNull(perm)) {
                 permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
             }
         }
@@ -111,8 +105,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 角色列表
      */
     @Override
-    public List<SysRole> selectRoleAll()
-    {
+    public List<SysRole> selectRoleAll() {
         return SpringUtils.getAopProxy(this).selectRoleList(new SysRole());
     }
 
@@ -123,8 +116,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 选中角色ID列表
      */
     @Override
-    public List<Long> selectRoleListByUserId(Long userId)
-    {
+    public List<Long> selectRoleListByUserId(Long userId) {
         return roleMapper.selectRoleListByUserId(userId);
     }
 
@@ -135,8 +127,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 角色对象信息
      */
     @Override
-    public SysRole selectRoleById(Long roleId)
-    {
+    public SysRole selectRoleById(Long roleId) {
         return roleMapper.selectRoleById(roleId);
     }
 
@@ -147,12 +138,10 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 结果
      */
     @Override
-    public String checkRoleNameUnique(SysRole role)
-    {
+    public String checkRoleNameUnique(SysRole role) {
         Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
         SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName());
-        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -165,12 +154,10 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 结果
      */
     @Override
-    public String checkRoleKeyUnique(SysRole role)
-    {
+    public String checkRoleKeyUnique(SysRole role) {
         Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
         SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey());
-        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -182,10 +169,8 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @param role 角色信息
      */
     @Override
-    public void checkRoleAllowed(SysRole role)
-    {
-        if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin())
-        {
+    public void checkRoleAllowed(SysRole role) {
+        if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin()) {
             throw new ServiceException("不允许操作超级管理员角色");
         }
     }
@@ -196,15 +181,12 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @param roleId 角色id
      */
     @Override
-    public void checkRoleDataScope(Long roleId)
-    {
-        if (!SysUser.isAdmin(SecurityUtils.getUserId()))
-        {
+    public void checkRoleDataScope(Long roleId) {
+        if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
             SysRole role = new SysRole();
             role.setRoleId(roleId);
             List<SysRole> roles = SpringUtils.getAopProxy(this).selectRoleList(role);
-            if (StringUtils.isEmpty(roles))
-            {
+            if (StringUtils.isEmpty(roles)) {
                 throw new ServiceException("没有权限访问角色数据！");
             }
         }
@@ -217,8 +199,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 结果
      */
     @Override
-    public int countUserRoleByRoleId(Long roleId)
-    {
+    public int countUserRoleByRoleId(Long roleId) {
         return userRoleMapper.countUserRoleByRoleId(roleId);
     }
 
@@ -230,8 +211,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Override
     @Transactional
-    public int insertRole(SysRole role)
-    {
+    public int insertRole(SysRole role) {
         // 新增角色信息
         roleMapper.insertRole(role);
         return insertRoleMenu(role);
@@ -245,8 +225,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Override
     @Transactional
-    public int updateRole(SysRole role)
-    {
+    public int updateRole(SysRole role) {
         // 修改角色信息
         roleMapper.updateRole(role);
         // 删除角色与菜单关联
@@ -261,8 +240,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 结果
      */
     @Override
-    public int updateRoleStatus(SysRole role)
-    {
+    public int updateRoleStatus(SysRole role) {
         return roleMapper.updateRole(role);
     }
 
@@ -274,8 +252,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Override
     @Transactional
-    public int authDataScope(SysRole role)
-    {
+    public int authDataScope(SysRole role) {
         // 修改角色信息
         roleMapper.updateRole(role);
         // 删除角色与部门关联
@@ -289,20 +266,17 @@ public class SysRoleServiceImpl implements ISysRoleService
      *
      * @param role 角色对象
      */
-    public int insertRoleMenu(SysRole role)
-    {
+    public int insertRoleMenu(SysRole role) {
         int rows = 1;
         // 新增用户与角色管理
         List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
-        for (Long menuId : role.getMenuIds())
-        {
+        for (Long menuId : role.getMenuIds()) {
             SysRoleMenu rm = new SysRoleMenu();
             rm.setRoleId(role.getRoleId());
             rm.setMenuId(menuId);
             list.add(rm);
         }
-        if (list.size() > 0)
-        {
+        if (list.size() > 0) {
             rows = roleMenuMapper.batchRoleMenu(list);
         }
         return rows;
@@ -313,20 +287,17 @@ public class SysRoleServiceImpl implements ISysRoleService
      *
      * @param role 角色对象
      */
-    public int insertRoleDept(SysRole role)
-    {
+    public int insertRoleDept(SysRole role) {
         int rows = 1;
         // 新增角色与部门（数据权限）管理
         List<SysRoleDept> list = new ArrayList<SysRoleDept>();
-        for (Long deptId : role.getDeptIds())
-        {
+        for (Long deptId : role.getDeptIds()) {
             SysRoleDept rd = new SysRoleDept();
             rd.setRoleId(role.getRoleId());
             rd.setDeptId(deptId);
             list.add(rd);
         }
-        if (list.size() > 0)
-        {
+        if (list.size() > 0) {
             rows = roleDeptMapper.batchRoleDept(list);
         }
         return rows;
@@ -340,8 +311,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Override
     @Transactional
-    public int deleteRoleById(Long roleId)
-    {
+    public int deleteRoleById(Long roleId) {
         // 删除角色与菜单关联
         roleMenuMapper.deleteRoleMenuByRoleId(roleId);
         // 删除角色与部门关联
@@ -357,15 +327,12 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Override
     @Transactional
-    public int deleteRoleByIds(Long[] roleIds)
-    {
-        for (Long roleId : roleIds)
-        {
+    public int deleteRoleByIds(Long[] roleIds) {
+        for (Long roleId : roleIds) {
             checkRoleAllowed(new SysRole(roleId));
             checkRoleDataScope(roleId);
             SysRole role = selectRoleById(roleId);
-            if (countUserRoleByRoleId(roleId) > 0)
-            {
+            if (countUserRoleByRoleId(roleId) > 0) {
                 throw new ServiceException(String.format("%1$s已分配,不能删除", role.getRoleName()));
             }
         }
@@ -383,38 +350,34 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 结果
      */
     @Override
-    public int deleteAuthUser(SysUserRole userRole)
-    {
+    public int deleteAuthUser(SysUserRole userRole) {
         return userRoleMapper.deleteUserRoleInfo(userRole);
     }
 
     /**
      * 批量取消授权用户角色
      *
-     * @param roleId 角色ID
+     * @param roleId  角色ID
      * @param userIds 需要取消授权的用户数据ID
      * @return 结果
      */
     @Override
-    public int deleteAuthUsers(Long roleId, Long[] userIds)
-    {
+    public int deleteAuthUsers(Long roleId, Long[] userIds) {
         return userRoleMapper.deleteUserRoleInfos(roleId, userIds);
     }
 
     /**
      * 批量选择授权用户角色
      *
-     * @param roleId 角色ID
+     * @param roleId  角色ID
      * @param userIds 需要授权的用户数据ID
      * @return 结果
      */
     @Override
-    public int insertAuthUsers(Long roleId, Long[] userIds)
-    {
+    public int insertAuthUsers(Long roleId, Long[] userIds) {
         // 新增用户与角色管理
         List<SysUserRole> list = new ArrayList<SysUserRole>();
-        for (Long userId : userIds)
-        {
+        for (Long userId : userIds) {
             SysUserRole ur = new SysUserRole();
             ur.setUserId(userId);
             ur.setRoleId(roleId);
@@ -422,4 +385,63 @@ public class SysRoleServiceImpl implements ISysRoleService
         }
         return userRoleMapper.batchUserRole(list);
     }
+
+    @Override
+    public int addRole(SysRole role) {
+        // 新增角色信息
+        return roleMapper.insertRole(role);
+    }
+
+    @Override
+    public int distributionModule(SysMenuIdsRequestVo sysMenuIdsRequestVo) {
+        return insertRoleMenuList(sysMenuIdsRequestVo);
+    }
+
+    @Override
+    public int updateRoles(SysRole role) {
+        // 修改角色信息
+        return roleMapper.updateRole(role);
+    }
+
+    @Override
+    public int updateDistributionModule(SysMenuIdsRequestVo sysMenuIdsRequestVo) {
+        // 删除角色与菜单关联
+        roleMenuMapper.deleteRoleMenuByRoleId(sysMenuIdsRequestVo.getRoleId());
+        return insertRoleMenuList(sysMenuIdsRequestVo);
+    }
+
+    @Override
+    public int changeStatus(List<SysStatusRequestVo> sysStatusRequestVoList) {
+        for (SysStatusRequestVo sysStatusRequestVo : sysStatusRequestVoList) {
+            SysRole sysRole = new SysRole();
+            sysRole.setRoleId(sysStatusRequestVo.getId());
+            sysRole.setStatus(sysStatusRequestVo.getStatus());
+            checkRoleAllowed(sysRole);
+            checkRoleDataScope(sysRole.getRoleId());
+            if (roleMapper.updateRole(sysRole)<=0){
+                return 0;
+            }
+        }
+        return  1;
+    }
+
+    /**
+     * 新增角色菜单信息
+     *
+     * @param sysMenuIdsRequestVo 分配模块
+     */
+    public int insertRoleMenuList(SysMenuIdsRequestVo sysMenuIdsRequestVo) {
+        int rows = 1;
+        List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
+        for (Long menuId : sysMenuIdsRequestVo.getMenuIds()) {
+            SysRoleMenu rm = new SysRoleMenu();
+            rm.setRoleId(sysMenuIdsRequestVo.getRoleId());
+            rm.setMenuId(menuId);
+            list.add(rm);
+        }
+        if (list.size() > 0) {
+            rows = roleMenuMapper.batchRoleMenu(list);
+        }
+        return rows;
+    }
 }

purchase-system/src/main/java/com/ozs/system/service/impl/SysUserServiceImpl.java

@@ -541,4 +541,23 @@ public class SysUserServiceImpl implements ISysUserService
         }
         return successMsg.toString();
     }
+
+    @Override
+    public int saveUser(SysUser user) {
+        // 新增用户信息
+        int rows = userMapper.insertUser(user);
+        // 新增用户与角色管理
+        insertUserRole(user);
+        return rows;
+    }
+
+    @Override
+    public int updateUsers(SysUser user) {
+        Long userId = user.getUserId();
+        // 删除用户与角色关联
+        userRoleMapper.deleteUserRoleByUserId(userId);
+        // 新增用户与角色管理
+        insertUserRole(user);
+        return userMapper.updateUser(user);
+    }
 }

purchase-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -126,8 +126,8 @@
             <if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
             <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
             <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
-            <if test="address != null and address != ''">#{address},</if>
-            <if test="remarks != null and remarks != ''">#{remarks},</if>
+            <if test="address != null and address != ''">address = #{address},</if>
+            <if test="remarks != null and remarks != ''">remarks = #{remarks},</if>
             <if test="orderNum != null">order_num = #{orderNum},</if>
             <if test="leader != null">leader = #{leader},</if>
             <if test="phone != null">phone = #{phone},</if>

purchase-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -98,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="roleId != null and roleId != 0">role_id,</if>
  			<if test="roleName != null and roleName != ''">role_name,</if>
  			<if test="roleKey != null and roleKey != ''">role_key,</if>
+		    <if test="roleRemarks != null and roleRemarks != ''">role_remarks,</if>
  			<if test="roleSort != null">role_sort,</if>
  			<if test="dataScope != null and dataScope != ''">data_scope,</if>
  			<if test="menuCheckStrictly != null">menu_check_strictly,</if>
@@ -110,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="roleId != null and roleId != 0">#{roleId},</if>
  			<if test="roleName != null and roleName != ''">#{roleName},</if>
  			<if test="roleKey != null and roleKey != ''">#{roleKey},</if>
+		    <if test="roleRemarks != null and roleRemarks != ''">#{role_remarks},</if>
  			<if test="roleSort != null">#{roleSort},</if>
  			<if test="dataScope != null and dataScope != ''">#{dataScope},</if>
  			<if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>