新增拼单订单表

sp-service/level-one-server/src/main/java/com/pj/tb_collage_orders/TbCollageOrders.java

@@ -0,0 +1,225 @@
+package com.pj.tb_collage_orders;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.EqualsAndHashCode;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * Model: tb_collage_orders -- 拼单订单表
+ * @author linbl
+ */
+@Data
+@Accessors(chain = true)
+@TableName(TbCollageOrders.TABLE_NAME)
+@EqualsAndHashCode(callSuper = false)
+public class TbCollageOrders extends Model<TbCollageOrders> implements Serializable {
+
+	// ---------- 模块常量 ----------
+	/**
+	 * 序列化版本id
+	 */
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 此模块对应的表名
+	 */
+	public static final String TABLE_NAME = "tb_collage_orders";
+	/**
+	 * 此模块对应的权限码
+	 */
+	public static final String PERMISSION_CODE = "tb-collage-orders";
+	public static final String PERMISSION_CODE_ADD = "tb-collage-orders-add";
+	public static final String PERMISSION_CODE_EDIT = "tb-collage-orders-edit";
+	public static final String PERMISSION_CODE_DEL = "tb-collage-orders-del";
+
+
+
+
+	// ---------- 表中字段 ----------
+	/**
+	 * 拼单订单表主键
+	 */
+	@TableId(type = IdType.AUTO)
+	private Long id;
+
+	/**
+	 * 贸易区域id
+	 */
+	private Long tradeAreaId;
+
+	/**
+	 * 贸易区域名称
+	 */
+	private String tradeAreaName;
+
+	/**
+	 * 订单编号
+	 */
+	private String orderNo;
+
+	/**
+	 * 合作社ID
+	 */
+	private String cooperativeId;
+
+	/**
+	 * 合作社名称
+	 */
+	private String cooperativeName;
+
+	/**
+	 * 总金额
+	 */
+	private Double totalPrice;
+
+	/**
+	 * 进境边民确认
+	 */
+	private String entryPeopleStatus;
+
+	/**
+	 * 进境组长确认
+	 */
+	private String entryLeaderStatus;
+
+	/**
+	 * 进境报关企业确认
+	 */
+	private String entryCustomsStatus;
+
+	/**
+	 * 进境申报单号
+	 */
+	private String entryNo;
+
+	/**
+	 * 进境申报时间
+	 */
+	private String entryTime;
+
+	/**
+	 * 进境申报结果
+	 */
+	private String entryResult;
+
+	/**
+	 * 进境申报失败理由
+	 */
+	private String entryFailReason;
+
+	/**
+	 * 进口边民确认
+	 */
+	private String importPeopleStatus;
+
+	/**
+	 * 进口组长确认
+	 */
+	private String importLeaderStatus;
+
+	/**
+	 * 进口申报单号
+	 */
+	private String importNo;
+
+	/**
+	 * 进口申报时间
+	 */
+	private String importTime;
+
+	/**
+	 * 是否收货
+	 */
+	private String isDelivery;
+
+	/**
+	 * 订单完成状态(0=未完成,1=已完成)
+	 */
+	private String orderFinish;
+
+	/**
+	 * 司机ID
+	 */
+	private Long driverId;
+
+	/**
+	 * 司机名称
+	 */
+	private String driverName;
+
+	/**
+	 * 司机电话
+	 */
+	private String driverPhone;
+
+	/**
+	 * 车ID
+	 */
+	private Long carId;
+
+	/**
+	 * 车名称
+	 */
+	private String carType;
+
+	/**
+	 * 车牌号
+	 */
+	private String vehiclePlate;
+
+	/**
+	 * 装货地址
+	 */
+	private String loadingAddress;
+
+	/**
+	 * 卸货地址
+	 */
+	private String unloadingAddress;
+
+	/**
+	 * 创建人编号
+	 */
+	private String createBy;
+
+	/**
+	 * 创建人名称
+	 */
+	private String createName;
+
+	/**
+	 * 创建时间
+	 */
+	private String createTime;
+
+	/**
+	 * 更新人编号
+	 */
+	private String updateBy;
+
+	/**
+	 * 更新人名称
+	 */
+	private String updateName;
+
+	/**
+	 * 更新时间
+	 */
+	private String updateTime;
+
+	/**
+	 * 删除状态(0=禁用,1=启用)
+	 */
+	private String deleteStatus;
+
+
+
+
+
+
+
+
+}

sp-service/level-one-server/src/main/java/com/pj/tb_collage_orders/TbCollageOrdersAppController.java

@@ -0,0 +1,58 @@
+package com.pj.tb_collage_orders;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pj.project4sp.SP;
+import com.pj.tb_collage_orders.param.TbCollageOrdersParam;
+import com.pj.utils.sg.AjaxJson;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * Controller: tb_collage_orders -- 拼单订单表(app接口)
+ * @author linbl
+ */
+@RestController
+@RequestMapping("/app/TbCollageOrders/")
+public class TbCollageOrdersAppController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	TbCollageOrdersService tbCollageOrdersService;
+
+	/** 增 */
+	@RequestMapping("addByCooperative")
+	public AjaxJson addByCooperative(TbCollageOrdersParam param){
+		return AjaxJson.toAjax(tbCollageOrdersService.addByCooperative(param));
+	}
+
+
+	/** 改 */
+	@RequestMapping("update")
+	public AjaxJson update(TbCollageOrders t){
+		tbCollageOrdersService.update(t);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 查 - 根据id */
+	@RequestMapping("getById")
+	public AjaxJson getById(Long id){
+		TbCollageOrders t = tbCollageOrdersService.getById(id);
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
+	@RequestMapping("getList")
+	public AjaxJson getList() {
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbCollageOrders> list = tbCollageOrdersService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+
+
+
+}

sp-service/level-one-server/src/main/java/com/pj/tb_collage_orders/TbCollageOrdersController.java

@@ -0,0 +1,87 @@
+package com.pj.tb_collage_orders;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import com.pj.utils.sg.*;
+import com.pj.project4sp.SP;
+
+import com.pj.current.satoken.StpUserUtil;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+
+/**
+ * Controller: tb_collage_orders -- 拼单订单表
+ * @author linbl
+ */
+@RestController
+@RequestMapping("/TbCollageOrders/")
+public class TbCollageOrdersController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	TbCollageOrdersService tbCollageOrdersService;
+
+	/** 增 */
+	@RequestMapping("add")
+	@SaCheckPermission(TbCollageOrders.PERMISSION_CODE_ADD)
+	public AjaxJson add(TbCollageOrders t){
+		tbCollageOrdersService.add(t);
+		t = tbCollageOrdersService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 删 */
+	@RequestMapping("delete")
+	@SaCheckPermission(TbCollageOrders.PERMISSION_CODE_DEL)
+	public AjaxJson delete(Long id){
+		 tbCollageOrdersService.delete(id);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 删 - 根据id列表 */
+	@RequestMapping("deleteByIds")
+	@SaCheckPermission(TbCollageOrders.PERMISSION_CODE_DEL)
+	public AjaxJson deleteByIds(){
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
+		int line = SP.publicMapper.deleteByIds(TbCollageOrders.TABLE_NAME, ids);
+		return AjaxJson.getByLine(line);
+	}
+
+	/** 改 */
+	@RequestMapping("update")
+	@SaCheckPermission(TbCollageOrders.PERMISSION_CODE_EDIT)
+	public AjaxJson update(TbCollageOrders t){
+		tbCollageOrdersService.update(t);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 查 - 根据id */
+	@RequestMapping("getById")
+		@SaCheckPermission(TbCollageOrders.PERMISSION_CODE)
+	public AjaxJson getById(Long id){
+		TbCollageOrders t = tbCollageOrdersService.getById(id);
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
+	@RequestMapping("getList")
+		@SaCheckPermission(TbCollageOrders.PERMISSION_CODE)
+	public AjaxJson getList() {
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbCollageOrders> list = tbCollageOrdersService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+
+
+
+
+
+
+
+
+
+}

sp-service/level-one-server/src/main/java/com/pj/tb_collage_orders/TbCollageOrdersMapper.java

@@ -0,0 +1,30 @@
+package com.pj.tb_collage_orders;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.pj.utils.so.*;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Mapper: tb_collage_orders -- 拼单订单表
+ * @author linbl
+ */
+
+@Mapper
+@Repository
+public interface TbCollageOrdersMapper extends BaseMapper <TbCollageOrders> {
+
+
+
+	/**
+	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	 * @param so 参数集合
+	 * @return 数据列表
+	 */
+	List<TbCollageOrders> getList(SoMap so);
+
+
+}

sp-service/level-one-server/src/main/java/com/pj/tb_collage_orders/TbCollageOrdersMapper.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pj.project.tb_collage_orders.TbCollageOrdersMapper">
+
+
+
+
+	<!-- ================================== 查询相关 ================================== -->
+	<!-- select id, trade_area_id, trade_area_name, order_no, cooperative_id, cooperative_name, total_price, entry_people_status, entry_leader_status, entry_customs_status, entry_no, entry_time, entry_result, entry_fail_reason, import_people_status, import_leader_status, import_no, import_time, is_delivery, order_finish, driver_id, driver_name, driver_phone, car_id, car_type, vehicle_plate, loading_address, unloading_address, create_by, create_name, create_time, update_by, update_name, update_time, delete_status from tb_collage_orders  -->
+
+	<!-- 通用映射：自动模式 -->
+	<resultMap id="model" autoMapping="true" type="com.pj.project.tb_collage_orders.TbCollageOrders"></resultMap>
+
+	<!-- 公共查询sql片段 -->
+	<sql id="select_sql">
+		select *
+		from tb_collage_orders
+	</sql>
+
+
+	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
+	<select id="getList" resultMap="model">
+		<include refid="select_sql"></include>
+		<where>
+			<if test=' this.has("id") '> and id = #{id} </if>
+			<if test=' this.has("tradeAreaId") '> and trade_area_id = #{tradeAreaId} </if>
+			<if test=' this.has("tradeAreaName") '> and trade_area_name = #{tradeAreaName} </if>
+			<if test=' this.has("orderNo") '> and order_no = #{orderNo} </if>
+			<if test=' this.has("cooperativeId") '> and cooperative_id = #{cooperativeId} </if>
+			<if test=' this.has("cooperativeName") '> and cooperative_name = #{cooperativeName} </if>
+			<if test=' this.has("totalPrice") '> and total_price = #{totalPrice} </if>
+			<if test=' this.has("entryPeopleStatus") '> and entry_people_status = #{entryPeopleStatus} </if>
+			<if test=' this.has("entryLeaderStatus") '> and entry_leader_status = #{entryLeaderStatus} </if>
+			<if test=' this.has("entryCustomsStatus") '> and entry_customs_status = #{entryCustomsStatus} </if>
+			<if test=' this.has("entryNo") '> and entry_no = #{entryNo} </if>
+			<if test=' this.has("entryTime") '> and entry_time = #{entryTime} </if>
+			<if test=' this.has("entryResult") '> and entry_result = #{entryResult} </if>
+			<if test=' this.has("entryFailReason") '> and entry_fail_reason = #{entryFailReason} </if>
+			<if test=' this.has("importPeopleStatus") '> and import_people_status = #{importPeopleStatus} </if>
+			<if test=' this.has("importLeaderStatus") '> and import_leader_status = #{importLeaderStatus} </if>
+			<if test=' this.has("importNo") '> and import_no = #{importNo} </if>
+			<if test=' this.has("importTime") '> and import_time = #{importTime} </if>
+			<if test=' this.has("isDelivery") '> and is_delivery = #{isDelivery} </if>
+			<if test=' this.has("orderFinish") '> and order_finish = #{orderFinish} </if>
+			<if test=' this.has("driverId") '> and driver_id = #{driverId} </if>
+			<if test=' this.has("driverName") '> and driver_name = #{driverName} </if>
+			<if test=' this.has("driverPhone") '> and driver_phone = #{driverPhone} </if>
+			<if test=' this.has("carId") '> and car_id = #{carId} </if>
+			<if test=' this.has("carType") '> and car_type = #{carType} </if>
+			<if test=' this.has("vehiclePlate") '> and vehicle_plate = #{vehiclePlate} </if>
+			<if test=' this.has("loadingAddress") '> and loading_address = #{loadingAddress} </if>
+			<if test=' this.has("unloadingAddress") '> and unloading_address = #{unloadingAddress} </if>
+			<if test=' this.has("createBy") '> and create_by = #{createBy} </if>
+			<if test=' this.has("createName") '> and create_name = #{createName} </if>
+			<if test=' this.has("createTime") '> and create_time = #{createTime} </if>
+			<if test=' this.has("updateBy") '> and update_by = #{updateBy} </if>
+			<if test=' this.has("updateName") '> and update_name = #{updateName} </if>
+			<if test=' this.has("updateTime") '> and update_time = #{updateTime} </if>
+			<if test=' this.has("deleteStatus") '> and delete_status = #{deleteStatus} </if>
+		</where>
+		order by
+		<choose>
+			<when test='sortType == 1'> id desc </when>
+			<when test='sortType == 2'> trade_area_id desc </when>
+			<when test='sortType == 3'> trade_area_name desc </when>
+			<when test='sortType == 4'> order_no desc </when>
+			<when test='sortType == 5'> cooperative_id desc </when>
+			<when test='sortType == 6'> cooperative_name desc </when>
+			<when test='sortType == 7'> total_price desc </when>
+			<when test='sortType == 8'> entry_people_status desc </when>
+			<when test='sortType == 9'> entry_leader_status desc </when>
+			<when test='sortType == 10'> entry_customs_status desc </when>
+			<when test='sortType == 11'> entry_no desc </when>
+			<when test='sortType == 12'> entry_time desc </when>
+			<when test='sortType == 13'> entry_result desc </when>
+			<when test='sortType == 14'> entry_fail_reason desc </when>
+			<when test='sortType == 15'> import_people_status desc </when>
+			<when test='sortType == 16'> import_leader_status desc </when>
+			<when test='sortType == 17'> import_no desc </when>
+			<when test='sortType == 18'> import_time desc </when>
+			<when test='sortType == 19'> is_delivery desc </when>
+			<when test='sortType == 20'> order_finish desc </when>
+			<when test='sortType == 21'> driver_id desc </when>
+			<when test='sortType == 22'> driver_name desc </when>
+			<when test='sortType == 23'> driver_phone desc </when>
+			<when test='sortType == 24'> car_id desc </when>
+			<when test='sortType == 25'> car_type desc </when>
+			<when test='sortType == 26'> vehicle_plate desc </when>
+			<when test='sortType == 27'> loading_address desc </when>
+			<when test='sortType == 28'> unloading_address desc </when>
+			<when test='sortType == 29'> create_by desc </when>
+			<when test='sortType == 30'> create_name desc </when>
+			<when test='sortType == 31'> create_time desc </when>
+			<when test='sortType == 32'> update_by desc </when>
+			<when test='sortType == 33'> update_name desc </when>
+			<when test='sortType == 34'> update_time desc </when>
+			<when test='sortType == 35'> delete_status desc </when>
+			<otherwise> id desc </otherwise>
+		</choose>
+	</select>
+
+
+
+
+
+
+
+
+
+
+</mapper>

sp-service/level-one-server/src/main/java/com/pj/tb_collage_orders/TbCollageOrdersService.java

@@ -0,0 +1,82 @@
+package com.pj.tb_collage_orders;
+
+import java.util.Date;
+import java.util.List;
+
+import com.pj.current.config.SystemObject;
+import com.pj.current.dto.APPLoginUserInfo;
+import com.pj.current.satoken.StpAPPUserUtil;
+import com.pj.tb_collage_orders.param.TbCollageOrdersParam;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import com.pj.utils.sg.*;
+
+/**
+ * Service: tb_collage_orders -- 拼单订单表
+ * @author linbl
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class TbCollageOrdersService extends ServiceImpl<TbCollageOrdersMapper, TbCollageOrders> implements IService<TbCollageOrders>{
+
+	/** 底层 Mapper 对象 */
+	@Autowired
+	TbCollageOrdersMapper tbCollageOrdersMapper;
+
+	/** 增 */
+	void add(TbCollageOrders t){
+		save(t);
+	}
+
+	/** 删 */
+	void delete(Long id){
+		removeById(id);
+	}
+
+	/** 改 */
+	void update(TbCollageOrders t){
+		updateById(t);
+
+	}
+
+	/** 查 */
+	TbCollageOrders getById(Long id){
+		return super.getById(id);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
+	List<TbCollageOrders> getList(SoMap so) {
+		return tbCollageOrdersMapper.getList(so);
+	}
+
+	/** 增 app合作社新增拼单订单 */
+	boolean addByCooperative(TbCollageOrdersParam param){
+		//拼单订单编号
+		String collageOrdersNo = SystemObject.getREFcode("PDDD",new Date());
+		param.setOrderNo(collageOrdersNo);
+		//1、TODO: 调用航通接口，把他们需要的拼单订单信息发送过去，接口返回的状态码为成功则走接下来的步骤，目前暂时省略
+
+		//获取当前登陆人
+		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+
+		//2、生成拼单订单
+		TbCollageOrders collageOrders = new TbCollageOrders();
+		collageOrders.setOrderNo(collageOrdersNo);
+		collageOrders.setCooperativeId(param.getCooperativeId());
+		collageOrders.setCooperativeName(param.getCooperativeName());
+
+		//
+		List<Long> orderList = param.getOrderList();
+		orderList.forEach(orderId -> {
+
+		});
+
+		return true;
+	}
+
+
+}

sp-service/level-one-server/src/main/java/com/pj/tb_collage_orders/TbCollageOrdersUtil.java

@@ -0,0 +1,29 @@
+package com.pj.tb_collage_orders;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.pj.utils.sg.*;
+
+/**
+ * 工具类：tb_collage_orders -- 拼单订单表
+ * @author linbl
+ *
+ */
+@Component
+public class TbCollageOrdersUtil {
+
+
+	/** 底层 Mapper 对象 */
+	public static TbCollageOrdersMapper tbCollageOrdersMapper;
+	@Autowired
+	private void setTbCollageOrdersMapper(TbCollageOrdersMapper tbCollageOrdersMapper) {
+		TbCollageOrdersUtil.tbCollageOrdersMapper = tbCollageOrdersMapper;
+	}
+
+
+
+
+
+
+}

sp-service/level-one-server/src/main/java/com/pj/tb_collage_orders/param/TbCollageOrdersParam.java

@@ -0,0 +1,38 @@
+package com.pj.tb_collage_orders.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 合作社生成拼单订单表时app返回的参数
+ * @author linbl
+ */
+@Data
+public class TbCollageOrdersParam {
+
+	/**
+	 * 订单编号
+	 */
+	private String orderNo;
+
+	/**
+	 * 合作社ID
+	 */
+	private String cooperativeId;
+
+	/**
+	 * 合作社名称
+	 */
+	private String cooperativeName;
+
+	/**
+	 * 总金额
+	 */
+	private Double totalPrice;
+
+	/**
+	 * 边民订单
+	 */
+	private List<Long> orderList;
+}

sp-service/level-one-server/src/main/java/com/pj/tb_goods_units/TbGoodsUnitsAppController.java

@@ -0,0 +1,39 @@
+package com.pj.tb_goods_units;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pj.project4sp.SP;
+import com.pj.utils.sg.AjaxJson;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+
+/**
+ * Controller: tb_goods_units -- 商品单位(app接口)
+ * @author lbl
+ */
+@RestController
+@RequestMapping("/app/TbGoodsUnits/")
+public class TbGoodsUnitsAppController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	TbGoodsUnitsService tbGoodsUnitsService;
+
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
+	@RequestMapping("getList")
+	public AjaxJson getList() {
+		List<TbGoodsUnits> list = tbGoodsUnitsService.getList(new SoMap());
+		return AjaxJson.getPageData(Long.valueOf(list.size()), list);
+	}
+
+
+}

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

@@ -1,6 +1,7 @@
 package com.pj.project.re_role_menu;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pj.project.app_menu.AppMenu;
 import com.pj.project.re_role_menu.dto.AssignPermissionsDto;
 import com.pj.project4sp.SP;
 import com.pj.utils.sg.AjaxJson;
@@ -17,7 +18,7 @@ import java.util.List;
 
 /**
  * Controller: re_role_menu -- app用户菜单中间表
- * @author qzy 
+ * @author qzy
  */
 @RestController
 @RequestMapping("/ReRoleMenu/")
@@ -27,7 +28,7 @@ public class PcRoleMenuController {
 	@Autowired
 	ReRoleMenuService reRoleMenuService;
 
-	/** 增 */  
+	/** 增 */
 	@RequestMapping("add")
 	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_ADD)
 	public AjaxJson add(ReRoleMenu r){
@@ -36,24 +37,24 @@ public class PcRoleMenuController {
 		return AjaxJson.getSuccessData(r);
 	}
 
-	/** 删 */  
+	/** 删 */
 	@RequestMapping("delete")
 	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_DEL)
 	public AjaxJson delete(Long id){
 		 reRoleMenuService.delete(id);
 		return AjaxJson.getSuccess();
 	}
-	
-	/** 删 - 根据id列表 */  
+
+	/** 删 - 根据id列表 */
 	@RequestMapping("deleteByIds")
 	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_DEL)
 	public AjaxJson deleteByIds(){
-		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
 		int line = SP.publicMapper.deleteByIds(ReRoleMenu.TABLE_NAME, ids);
 		return AjaxJson.getByLine(line);
 	}
-	
-	/** 改 */  
+
+	/** 改 */
 	@RequestMapping("update")
 	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_EDIT)
 	public AjaxJson update(ReRoleMenu r){
@@ -61,7 +62,7 @@ public class PcRoleMenuController {
 		return AjaxJson.getSuccess();
 	}
 
-	/** 查 - 根据id */  
+	/** 查 - 根据id */
 	@RequestMapping("getById")
 		@SaCheckPermission(ReRoleMenu.PERMISSION_CODE)
 	public AjaxJson getById(Long id){
@@ -81,14 +82,14 @@ public class PcRoleMenuController {
 		List<ReRoleMenu> list = reRoleMenuService.getList(so.startPage(),appRoleId);
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
-	
+
 	/**
 	 * pc端:可以根据不同app角色进行菜单权限分配
 	 * @param assignPermissionsDto 职务ID和该职务下属的权限的集合
 	 * @return
 	 */
 	@RequestMapping("assignPermissions")
-		@SaCheckPermission(ReRoleMenu.PERMISSION_CODE)
+		@SaCheckPermission(AppMenu.PERMISSION_CODE_ADD)
 	public AjaxJson assignPermissions(@Validated @RequestBody AssignPermissionsDto assignPermissionsDto) {
 		boolean permissions = reRoleMenuService.assignPermissions(assignPermissionsDto);
 		if(permissions)return AjaxJson.getSuccess("权限分配成功!");
@@ -96,11 +97,11 @@ public class PcRoleMenuController {
 	}
 
 
-	
-	
 
-	
-	
-	
+
+
+
+
+
 
 }