1

pro-base/src/main/java/com/idea/my/controller/MyMenuController.java

@@ -0,0 +1,107 @@
+package com.idea.my.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.idea.my.model.MyMenu;
+import com.idea.my.service.MyMenuService;
+import com.rockstar.common.base.BaseController;
+import com.rockstar.common.domain.AjaxResult;
+import com.rockstar.frame.model.extend.DateTrans;
+import com.rockstar.frame.model.extend.TableSplitResult;
+import com.rockstar.frame.model.extend.Tablepar;
+import com.rockstar.frame.service.FramePermissionService;
+import com.rockstar.util.SnowflakeIdWorker;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.Date;
+
+/**
+ * Created by xuyq on 2019/7/2.
+ */
+@Controller
+@RequestMapping(value = "MyMenuController")
+@Api(value = "我的快捷菜单")
+public class MyMenuController extends BaseController {
+
+    @Autowired
+    private MyMenuService modelService;
+
+    @Autowired
+    private FramePermissionService framePermissionService;
+
+
+    @PostMapping(value = "list",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object list(Tablepar tablepar, MyMenu model, DateTrans dt){
+        PageInfo<MyMenu> page = modelService.list(tablepar, model, dt);
+        TableSplitResult<MyMenu> result=new TableSplitResult<MyMenu>(page.getPageNum(), page.getTotal(), page.getList());
+        return  result;
+    }
+
+    @PostMapping(value = "listAll",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object listAll(MyMenu model, DateTrans dt){
+        return modelService.listAll(model,dt);
+    }
+
+    @PostMapping(value = "getMyMenu",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object getMyMenu(MyMenu model){
+        return modelService.getMyMenu(model);
+    }
+
+    @PostMapping(value = "listPermissionAll",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object listPermissionAll(MyMenu model){
+        return  this.framePermissionService.getMenuTree();
+    }
+
+
+    @PostMapping(value = "add",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult add(MyMenu model){
+        String auditId = SnowflakeIdWorker.getUUID();
+        model.setCreatedAt(new Date());
+        model.setId(auditId);
+        int result = modelService.insert(model);
+        AjaxResult ajaxResult = result(result);
+        ajaxResult.put("auditId", auditId);
+        return ajaxResult;
+
+    }
+
+    @PostMapping(value = "remove/{id}",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult remove(@PathVariable("id") String id){
+        int result = modelService.deleteByPrimaryKey(id);
+        return result(result);
+    }
+
+    @PostMapping(value = "edit",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult editSave(MyMenu model){
+        model.setUpdatedAt(new Date());
+        int result = modelService.updateByPrimaryKeySelective(model);
+        return result(result);
+    }
+
+    @PostMapping(value = "getById",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public MyMenu getbyId(String id)
+    {
+        return modelService.selectByPrimaryKey(id);
+    }
+
+
+
+    @PostMapping(value = "bizUserListAll",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object bizUserListAll(String mainId){
+        return modelService.bizUserListAll(mainId);
+    }
+}

pro-base/src/main/java/com/idea/my/mapper/MyMenuMapper.java

@@ -0,0 +1,31 @@
+package com.idea.my.mapper;
+
+import com.idea.my.model.MyMenu;
+import com.idea.my.model.MyMenuExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface MyMenuMapper {
+    long countByExample(MyMenuExample example);
+
+    int deleteByExample(MyMenuExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(MyMenu record);
+
+    int insertSelective(MyMenu record);
+
+    List<MyMenu> selectByExample(MyMenuExample example);
+
+    MyMenu selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") MyMenu record, @Param("example") MyMenuExample example);
+
+    int updateByExample(@Param("record") MyMenu record, @Param("example") MyMenuExample example);
+
+    int updateByPrimaryKeySelective(MyMenu record);
+
+    int updateByPrimaryKey(MyMenu record);
+}

pro-base/src/main/java/com/idea/my/model/MyMenu.java

@@ -0,0 +1,78 @@
+package com.idea.my.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class MyMenu implements Serializable {
+    private String id;
+
+    private String userId;
+
+    private String menuId;
+
+    private String createdBy;
+
+    private Date createdAt;
+
+    private String updatedBy;
+
+    private Date updatedAt;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId == null ? null : userId.trim();
+    }
+
+    public String getMenuId() {
+        return menuId;
+    }
+
+    public void setMenuId(String menuId) {
+        this.menuId = menuId == null ? null : menuId.trim();
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy == null ? null : createdBy.trim();
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public String getUpdatedBy() {
+        return updatedBy;
+    }
+
+    public void setUpdatedBy(String updatedBy) {
+        this.updatedBy = updatedBy == null ? null : updatedBy.trim();
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+}

pro-base/src/main/java/com/idea/my/model/MyMenuExample.java

@@ -0,0 +1,671 @@
+package com.idea.my.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MyMenuExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public MyMenuExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(String value) {
+            addCriterion("user_id =", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(String value) {
+            addCriterion("user_id <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(String value) {
+            addCriterion("user_id >", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
+            addCriterion("user_id >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(String value) {
+            addCriterion("user_id <", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(String value) {
+            addCriterion("user_id <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLike(String value) {
+            addCriterion("user_id like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotLike(String value) {
+            addCriterion("user_id not like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<String> values) {
+            addCriterion("user_id in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<String> values) {
+            addCriterion("user_id not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(String value1, String value2) {
+            addCriterion("user_id between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(String value1, String value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMenuIdIsNull() {
+            addCriterion("menu_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMenuIdIsNotNull() {
+            addCriterion("menu_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMenuIdEqualTo(String value) {
+            addCriterion("menu_id =", value, "menuId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMenuIdNotEqualTo(String value) {
+            addCriterion("menu_id <>", value, "menuId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMenuIdGreaterThan(String value) {
+            addCriterion("menu_id >", value, "menuId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMenuIdGreaterThanOrEqualTo(String value) {
+            addCriterion("menu_id >=", value, "menuId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMenuIdLessThan(String value) {
+            addCriterion("menu_id <", value, "menuId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMenuIdLessThanOrEqualTo(String value) {
+            addCriterion("menu_id <=", value, "menuId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMenuIdLike(String value) {
+            addCriterion("menu_id like", value, "menuId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMenuIdNotLike(String value) {
+            addCriterion("menu_id not like", value, "menuId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMenuIdIn(List<String> values) {
+            addCriterion("menu_id in", values, "menuId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMenuIdNotIn(List<String> values) {
+            addCriterion("menu_id not in", values, "menuId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMenuIdBetween(String value1, String value2) {
+            addCriterion("menu_id between", value1, value2, "menuId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMenuIdNotBetween(String value1, String value2) {
+            addCriterion("menu_id not between", value1, value2, "menuId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByIsNull() {
+            addCriterion("created_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByIsNotNull() {
+            addCriterion("created_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByEqualTo(String value) {
+            addCriterion("created_by =", value, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByNotEqualTo(String value) {
+            addCriterion("created_by <>", value, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByGreaterThan(String value) {
+            addCriterion("created_by >", value, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByGreaterThanOrEqualTo(String value) {
+            addCriterion("created_by >=", value, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByLessThan(String value) {
+            addCriterion("created_by <", value, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByLessThanOrEqualTo(String value) {
+            addCriterion("created_by <=", value, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByLike(String value) {
+            addCriterion("created_by like", value, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByNotLike(String value) {
+            addCriterion("created_by not like", value, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByIn(List<String> values) {
+            addCriterion("created_by in", values, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByNotIn(List<String> values) {
+            addCriterion("created_by not in", values, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByBetween(String value1, String value2) {
+            addCriterion("created_by between", value1, value2, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByNotBetween(String value1, String value2) {
+            addCriterion("created_by not between", value1, value2, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByIsNull() {
+            addCriterion("updated_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByIsNotNull() {
+            addCriterion("updated_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByEqualTo(String value) {
+            addCriterion("updated_by =", value, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByNotEqualTo(String value) {
+            addCriterion("updated_by <>", value, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByGreaterThan(String value) {
+            addCriterion("updated_by >", value, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByGreaterThanOrEqualTo(String value) {
+            addCriterion("updated_by >=", value, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByLessThan(String value) {
+            addCriterion("updated_by <", value, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByLessThanOrEqualTo(String value) {
+            addCriterion("updated_by <=", value, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByLike(String value) {
+            addCriterion("updated_by like", value, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByNotLike(String value) {
+            addCriterion("updated_by not like", value, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByIn(List<String> values) {
+            addCriterion("updated_by in", values, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByNotIn(List<String> values) {
+            addCriterion("updated_by not in", values, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByBetween(String value1, String value2) {
+            addCriterion("updated_by between", value1, value2, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByNotBetween(String value1, String value2) {
+            addCriterion("updated_by not between", value1, value2, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

pro-base/src/main/java/com/idea/my/service/MyMenuService.java

@@ -0,0 +1,170 @@
+package com.idea.my.service;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.idea.my.mapper.MyMenuMapper;
+import com.idea.my.model.MyMenu;
+import com.idea.my.model.MyMenuExample;
+import com.rockstar.biz.model.BizUser;
+import com.rockstar.biz.model.BizUserExample;
+import com.rockstar.biz.service.BizUserService;
+import com.rockstar.common.base.BaseService;
+import com.rockstar.common.support.Convert;
+import com.rockstar.frame.model.FramePermission;
+import com.rockstar.frame.model.FramePermissionExample;
+import com.rockstar.frame.model.extend.DateTrans;
+import com.rockstar.frame.model.extend.Tablepar;
+import com.rockstar.frame.service.FramePermissionService;
+import com.rockstar.util.SnowflakeIdWorker;
+import com.rockstar.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+@Service
+public class MyMenuService implements BaseService<MyMenu, MyMenuExample> {
+
+    //文件mapper
+    @Autowired
+    private MyMenuMapper modelMapper;
+
+    @Autowired
+    private FramePermissionService framePermissionService;
+
+    @Autowired
+    private BizUserService bizUserService;
+
+    @Override
+    public int deleteByPrimaryKey(String ids) {
+        List<String> lista = Convert.toListStrArray(ids);
+        MyMenuExample example = new MyMenuExample();
+        example.createCriteria().andIdIn(lista);
+        return modelMapper.deleteByExample(example);
+    }
+
+    @Override
+    public MyMenu selectByPrimaryKey(String id) {
+        return modelMapper.selectByPrimaryKey(id);
+    }
+    @Override
+    public int updateByPrimaryKeySelective(MyMenu record) {
+        if(StringUtils.isEmpty(record.getId())){
+            record.setId(SnowflakeIdWorker.getUUID());
+            record.setCreatedAt(new Date());
+            return modelMapper.insert(record);
+        }
+        return modelMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public int updateByExampleSelective(MyMenu record, MyMenuExample example) {
+        return modelMapper.updateByExampleSelective(record, example);
+    }
+
+    @Override
+    public int updateByExample(MyMenu record, MyMenuExample example) {
+        return modelMapper.updateByExample(record, example);
+    }
+
+    @Override
+    public List<MyMenu> selectByExample(MyMenuExample example) {
+        return modelMapper.selectByExample(example);
+    }
+
+    @Override
+    public long countByExample(MyMenuExample example) {
+        return modelMapper.countByExample(example);
+    }
+
+    @Override
+    public int deleteByExample(MyMenuExample example) {
+        return modelMapper.deleteByExample(example);
+    }
+
+
+    public int insertWithoutId(MyMenu record){
+        return modelMapper.insert(record);
+    }
+
+    @Override
+    public int insertSelective(MyMenu record) {
+        record.setId(SnowflakeIdWorker.getUUID());
+        return modelMapper.insertSelective(record);
+    }
+
+    public int insert(MyMenu record){
+        record.setId(SnowflakeIdWorker.getUUID());
+        return modelMapper.insert(record);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @return
+     */
+    public PageInfo<MyMenu> list(Tablepar tablepar, MyMenu model, DateTrans dt) {
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        List<MyMenu> list = modelMapper.selectByExample(getCondition(model,dt));
+        PageInfo<MyMenu> pageInfo = new PageInfo<>(list);
+        return pageInfo;
+    }
+    /**
+     * 查询指定
+     *
+     * @return
+     */
+    public Map<String,Object> listAll(MyMenu model, DateTrans dt) {
+        Map<String,Object> map = new HashMap<>();
+        List<FramePermission> list = new ArrayList<>();
+        List<MyMenu> myMenus = modelMapper.selectByExample(getCondition(model, dt));
+        if(myMenus!=null&&myMenus.size()>0){
+            MyMenu myMenu = myMenus.get(0);
+            if(StringUtils.isNotEmpty(myMenu.getMenuId())&&myMenu.getMenuId().length()>2){
+                List lists = new ArrayList();
+                JSONArray jsonArray = JSONUtil.parseArray(myMenu.getMenuId());
+//                JSONArray jsonArray = JSONArray.fromObject(myMenu.getMenuId());//把String转换为json
+//                lists = JSONArray.toList(jsonArray);
+                lists = JSONUtil.toList(jsonArray, String.class);
+                FramePermissionExample example = new FramePermissionExample();
+                example.createCriteria().andIdIn(lists);
+                list = framePermissionService.selectByExample(example);
+            }
+        }
+        map.put("myPermission",list);
+        List<FramePermission>  listAll = framePermissionService.selectByExample(new FramePermissionExample());
+        map.put("allPermission",listAll);
+        return map;
+    }
+
+    public MyMenu getMyMenu(MyMenu model){
+        MyMenu myMenu = new MyMenu();
+        List<MyMenu> myMenus = modelMapper.selectByExample(getCondition(model, null));
+        if(myMenus!=null&&myMenus.size()>0){
+            myMenu = myMenus.get(0);
+        }
+        return myMenu;
+    }
+
+    private MyMenuExample getCondition(MyMenu model, DateTrans dt) {
+        MyMenuExample ex = new MyMenuExample();
+        if(null == model){
+            return ex;
+        }
+        ex.setOrderByClause("created_at desc");
+        MyMenuExample.Criteria criteria = ex.createCriteria();
+        if(StringUtils.isNotEmpty(model.getUserId())){
+            criteria.andUserIdEqualTo(model.getUserId());
+        }
+        return ex;
+    }
+
+    public List<BizUser> bizUserListAll(String mainId){
+        BizUserExample example = new BizUserExample();
+        example.createCriteria().andMainIdEqualTo(mainId);
+        return bizUserService.selectByExample(example);
+    }
+
+}

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyPaymentSettleController.java

@@ -191,7 +191,8 @@ public class ApplyPaymentSettleController extends BaseController {
                     String srcUserId = ShiroUtils.getUserId();
                     String srcUserName = ShiroUtils.getLoginName();
                     String receiveUserId = push.getId();
-                    String routeParam = "id=" + flowMain.getId();
+                    String routeParam = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId()
+                            + "applyUser=" + flowMain.getApplyUser();
                     parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName,
                             receiveUserId, routeParam);
                 }
@@ -306,56 +307,58 @@ public class ApplyPaymentSettleController extends BaseController {
         if(CollectionUtils.isNotEmpty(flowMains)){
             FlowMain flowMain = flowMains.get(0);
             flowId = flowMain.getId();
-        }
-        FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
-        flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
-        List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
-        if(CollectionUtils.isNotEmpty(flowMainPushes)){
-            FlowMainPush flowMainPush = flowMainPushes.get(0);
-            nodeName = flowMainPush.getNodeName();
-
-            JSONObject json = new JSONObject();
-            json.put("syscode",syscode);
-            json.put("flowId",flowId);
-            json.put("requestname",requestname);
-            json.put("workflowname",workflowname);
-            json.put("nodeName",nodeName);
-            json.put("pcurl",pcurl);
-            json.put("appurl",appurl);
-            json.put("isremark",isremark);
-            json.put("viewtype",viewtype);
-            json.put("creator",creator);
-            json.put("receiver",receiver);
-            json.put("date",date);
-            json.put("receivets",receivets);
-
-            // 给本系统下一个节点的人推送待办
-            /**
-             * 添加待办
-             * @param title 显示标题
-             * @param typeEnum 处理类型枚举
-             * @param srcUserType 来源用户类型 0管理,1企业
-             * @param srcUserId 来源用户id
-             * @param srcUserName 来源用户名称
-             * @param receiveUserId 接收用户id or 0=全部  or 角色id
-             * @param routeParam 跳转携带参数，例： id=***&type=**
-             */
-            String title = applyTheme;
-            HandleTypeEnum typeEnum = HandleTypeEnum.FK;
-            Integer srcUserType = 0;//来源用户类型 0管理,1企业
-            String srcUserId = ShiroUtils.getUserId();
-            String srcUserName = ShiroUtils.getLoginName();
-            String receiveUserId = flowMainPush.getPushUser();
-            String routeParam = "id=" + flowId;
-            parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName,
-                    receiveUserId, routeParam);
 
+            FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
+            flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
+            List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
+            if(CollectionUtils.isNotEmpty(flowMainPushes)){
+                FlowMainPush flowMainPush = flowMainPushes.get(0);
+                nodeName = flowMainPush.getNodeName();
+
+                JSONObject json = new JSONObject();
+                json.put("syscode",syscode);
+                json.put("flowId",flowId);
+                json.put("requestname",requestname);
+                json.put("workflowname",workflowname);
+                json.put("nodeName",nodeName);
+                json.put("pcurl",pcurl);
+                json.put("appurl",appurl);
+                json.put("isremark",isremark);
+                json.put("viewtype",viewtype);
+                json.put("creator",creator);
+                json.put("receiver",receiver);
+                json.put("date",date);
+                json.put("receivets",receivets);
+
+                // 给本系统下一个节点的人推送待办
+                /**
+                 * 添加待办
+                 * @param title 显示标题
+                 * @param typeEnum 处理类型枚举
+                 * @param srcUserType 来源用户类型 0管理,1企业
+                 * @param srcUserId 来源用户id
+                 * @param srcUserName 来源用户名称
+                 * @param receiveUserId 接收用户id or 0=全部  or 角色id
+                 * @param routeParam 跳转携带参数，例： id=***&type=**
+                 */
+                String title = applyTheme;
+                HandleTypeEnum typeEnum = HandleTypeEnum.FK;
+                Integer srcUserType = 0;//来源用户类型 0管理,1企业
+                String srcUserId = ShiroUtils.getUserId();
+                String srcUserName = ShiroUtils.getLoginName();
+                String receiveUserId = flowMainPush.getPushUser();
+                String routeParam = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "applyUser=" + flowMain.getApplyUser();;
+                parkWaitHandleService.addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName,
+                        receiveUserId, routeParam);
+
+            }
 
         }
 
 
 
 
+
         if (ajaxResult.get("code").equals(1688)) {
 //            //表成功了 且已经审核完成
 ////            需要进行后续的处理