pc-角色分配权限修改

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleController.java

@@ -3,6 +3,7 @@ package com.pj.tb_people;
 import java.io.IOException;
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pj.api.dto.PeopleDto;
 import com.pj.tb_people.dto.StartStopDto;
 import com.pj.utils.so.SoMap;
@@ -182,10 +183,13 @@ public class TbPeopleController {
      * @date
      */
     @RequestMapping("passApply")
-    public AjaxJson passApply(@RequestParam("leaderId") Long leaderId, @RequestParam("peopleId") Long peopleId, @RequestParam("approve") int approve) {
-        int line = tbPeopleService.passApply(leaderId, peopleId, approve);
-        return AjaxJson.getByLine(line);
-
+    public AjaxJson passApply(@RequestParam("groupId") Long groupId, @RequestParam("peopleIds") String peopleIds, @RequestParam("approve") int approve) {
+        approve = 1;//同意
+        String[] peopleIdarr = peopleIds.split(",");
+        for (String peopleId: peopleIdarr) {
+            tbPeopleService.passApply(groupId, Long.valueOf(peopleId), approve);
+        }
+        return AjaxJson.getSuccess("边民加入互助组成功");
     }
 
 

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleMapper.xml

@@ -32,7 +32,7 @@
 		values
 		(
 		<if test="peopleId">#{peopleId},</if>
-		<if test="groupId"> #{groupId}</if>
+		<if test="groupId"> #{groupId},</if>
 		 0
 		)
 	</insert>

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleService.java

@@ -239,7 +239,7 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 	 * @author loovi
 	 * @date
 	 */
-	public int passApply(Long leaderId,Long peopleId,int approve){
+	public int passApply(Long groupId,Long peopleId,int approve){
 		// 组长不同意申请
 		if(approve==2){
 			int i = tbPeopleMapper.updateApplyStatus(approve,peopleId);
@@ -260,10 +260,8 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 		if(tbPeople.getIsLock()== DeleteStatus.DELETE_STATUS_OFF.getCode()){
 			throw new RuntimeException("用户已删除");
 		}
-		//根据互助组组长id查询互助组
-		QueryWrapper<TbGroup> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("leader_id", leaderId);
-		TbGroup tbGroup = tbGroupMapper.selectOne(queryWrapper);
+		//根据互助组id查询互助组
+		TbGroup tbGroup = tbGroupMapper.selectById(groupId);
 		// 修改申请表状态为1通过
 		tbPeopleMapper.updateApplyStatus(approve,peopleId);
 		// 把互助组信息写入申请的边民表

sp-service/sp-admin/src/main/java/com/pj/project/app_menu/AppMenu.java

@@ -13,7 +13,7 @@ import lombok.experimental.Accessors;
 
 /**
  * Model: app_menu -- app菜单管理
- * @author qzy 
+ * @author qzy
  */
 @Data
 @Accessors(chain = true)
@@ -23,15 +23,15 @@ public class AppMenu extends Model<AppMenu> implements Serializable {
 
 	// ---------- 模块常量 ----------
 	/**
-	 * 序列化版本id 
+	 * 序列化版本id
 	 */
-	private static final long serialVersionUID = 1L;	
+	private static final long serialVersionUID = 1L;
 	/**
-	 * 此模块对应的表名 
+	 * 此模块对应的表名
 	 */
-	public static final String TABLE_NAME = "app_menu";	
+	public static final String TABLE_NAME = "app_menu";
 	/**
-	 * 此模块对应的权限码 
+	 * 此模块对应的权限码
 	 */
 	public static final String PERMISSION_CODE = "app-menu";
 	public static final String PERMISSION_CODE_ADD = "app-menu-add";
@@ -43,78 +43,78 @@ public class AppMenu extends Model<AppMenu> implements Serializable {
 
 	// ---------- 表中字段 ----------
 	/**
-	 * 主键 
+	 * 主键
 	 */
 	@TableId(type = IdType.AUTO)
-	private Long id;	
+	private Long id;
 
 	/**
-	 * 前端路径 
+	 * 前端路径
 	 */
-	private String path;	
+	private String path;
 
 	/**
-	 * 菜单名称 
+	 * 菜单名称
 	 */
-	private String menuName;	
+	private String menuName;
 
 	/**
-	 * 图标 
+	 * 图标
 	 */
-	private String icon;	
+	private String icon;
 
 	/**
-	 * 排序 
+	 * 排序
 	 */
-	private Integer sort;	
+	private Integer sort;
 
 	/**
-	 * 状态(0=禁用,1=启用) 
+	 * 状态(0=禁用,1=启用)
 	 */
-	private String enable;	
+	private Integer enable=1;
 
 	/**
-	 * 是否认证后访问(0=否,1=是) 
+	 * 是否认证后访问(0=否,1=是)
 	 */
-	private String auth;	
+	private String auth;
 
 	/**
-	 * 创建时间 
+	 * 创建时间
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date createTime;
 
 	/**
-	 * 创建人编号 
+	 * 创建人编号
 	 */
-	private String createBy;	
+	private String createBy;
 
 	/**
-	 * 创建人名称 
+	 * 创建人名称
 	 */
-	private String createName;	
+	private String createName;
 
 	/**
-	 * 更新时间 
+	 * 更新时间
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date updateTime;
 
 	/**
-	 * 更新人编号 
+	 * 更新人编号
 	 */
-	private String updateBy;	
+	private String updateBy;
 
 	/**
-	 * 更新人名称 
+	 * 更新人名称
 	 */
-	private String updateName;	
+	private String updateName;
+
 
 
 
 
 
-	
 
 
 }

sp-service/sp-admin/src/main/java/com/pj/project/re_role_menu/ReRoleMenuService.java

@@ -18,7 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Service: re_role_menu -- app用户菜单中间表
- * @author qzy 
+ * @author qzy
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -52,10 +52,10 @@ public class ReRoleMenuService extends ServiceImpl<ReRoleMenuMapper, ReRoleMenu>
 		return super.getById(id);
 	}
 
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
 	List<ReRoleMenu> getList(SoMap so,Integer appRoleId) {
 		so.set("app_role_id",appRoleId);
-		return reRoleMenuMapper.getList(so);	
+		return reRoleMenuMapper.getList(so);
 	}
 
 
@@ -66,19 +66,22 @@ public class ReRoleMenuService extends ServiceImpl<ReRoleMenuMapper, ReRoleMenu>
 		//app_menu的主键进行去重
 		List<Long> permissionsDtoList = assignPermissionsDto.getList().stream().distinct().collect(Collectors.toList());
 		//情况1:传进来的集合为空,默认删除该职务下属的所有权限
-		if(permissionsDtoList.size() == 0){
+		//if(permissionsDtoList.size() == 0){
 			//删除所有权限
-			List<Long> perList = methodRoleMenuService.getPerList(roleId);
+			//List<Long> perList = methodRoleMenuService.getPerList(roleId);
 			//清除
-			int i = reRoleMenuMapper.deleteBatchIds(perList);
-			return i == perList.size();
-		}
+			//int i = reRoleMenuMapper.deleteBatchIds(perList);
+			//return i == perList.size();
+			//int i = reRoleMenuMapper.delete(new LambdaQueryWrapper<ReRoleMenu>().eq(ReRoleMenu::getAppRoleId, roleId));
+			//return true;
+		//}
 		//情况2: 传进来的集合不为空
 		//2.1 先清除该职务的权限
-		List<Long> perList = methodRoleMenuService.getPerList(roleId);
+		//List<Long> perList = methodRoleMenuService.getPerList(roleId);
 		//执行清除
-		int i = reRoleMenuMapper.deleteBatchIds(perList);
-		if(i != perList.size())throw new RuntimeException("权限分配失败Ⅰ!");
+		//int i = reRoleMenuMapper.deleteBatchIds(perList);
+		//if(i != perList.size())throw new RuntimeException("权限分配失败Ⅰ!");
+		int i = reRoleMenuMapper.delete(new LambdaQueryWrapper<ReRoleMenu>().eq(ReRoleMenu::getAppRoleId, roleId));
 		//2.2 再添加新的权限给到该职务
 		//定义计数器
 		int count = 0;
@@ -90,6 +93,6 @@ public class ReRoleMenuService extends ServiceImpl<ReRoleMenuMapper, ReRoleMenu>
 
 		return count == permissionsDtoList.size();
 	}
-	
+
 
 }