Merge remote-tracking branch 'origin/master'

src/main/java/com/xujie/modules/base/controller/PropertiesController.java

@@ -12,6 +12,7 @@ import com.xujie.modules.base.service.PlmPropertiesItemService;
 import com.xujie.modules.base.service.PropertiesService;
 import com.xujie.modules.sys.controller.AbstractController;
 import com.xujie.modules.sys.entity.DictData;
+import com.xujie.modules.sys.entity.SysMenuEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -340,6 +341,13 @@ public class PropertiesController extends AbstractController {
         return R.ok();
     }
 
+    @PostMapping("/menu/list")
+    @ResponseBody
+    public R searchMenuAllListId(@RequestBody PlmPropertiesModelHeader properties){
+        List<SysMenuEntity> list = propertiesService.searchMenuAllListId(properties);
+        return R.ok().put("rows",list);
+    }
+
     @PostMapping("/item/type/list")
     @ResponseBody
     public R searchAllItemTypeList(@RequestBody PlmPropertiesItem propertiesItem){

src/main/java/com/xujie/modules/base/dao/PropertiesMapper.java

@@ -7,6 +7,7 @@ import com.xujie.modules.base.data.*;
 import com.xujie.modules.base.entity.*;
 
 import com.xujie.modules.sys.entity.DictData;
+import com.xujie.modules.sys.entity.SysMenuEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -243,6 +244,8 @@ public interface PropertiesMapper extends BaseMapper<PlmPropertiesItemData> {
 
     void updatePlmPropertiesModelDetailOrder(PlmPropertiesModelDetail data);
 
+    List<SysMenuEntity> searchMenuAllListId(@Param("site") String site);
+
     List<DictData> searchAllItemTypeList(PlmPropertiesItem propertiesItem);
 
     List<Map<String, Object>> searchAllTypeList();

src/main/java/com/xujie/modules/base/service/Impl/PropertiesServiceImpl.java

@@ -18,6 +18,7 @@ import com.xujie.modules.base.service.PropertiesService;
 
 import com.xujie.modules.sys.dao.SysUserDao;
 import com.xujie.modules.sys.entity.DictData;
+import com.xujie.modules.sys.entity.SysMenuEntity;
 import com.xujie.modules.sys.entity.SysUserEntity;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -285,6 +286,11 @@ public class PropertiesServiceImpl implements PropertiesService {
         return propertiesMapper.searchAllTypeList();
     }
 
+    @Override
+    public List<SysMenuEntity> searchMenuAllListId(PlmPropertiesModelHeader properties) {
+        return propertiesMapper.searchMenuAllListId(properties.getSite());
+    }
+
     @Override
     public List<PlmPropertiesItemData> getItemListsForPartAndCode(PlmPropertiesModelHeaderData inData){
         return propertiesMapper.getItemListsForPartAndCode(inData);

src/main/java/com/xujie/modules/base/service/PropertiesService.java

@@ -6,6 +6,7 @@ import com.xujie.modules.base.data.*;
 import com.xujie.modules.base.entity.*;
 
 import com.xujie.modules.sys.entity.DictData;
+import com.xujie.modules.sys.entity.SysMenuEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -219,6 +220,8 @@ public interface PropertiesService {
 
 
 
+    List<SysMenuEntity> searchMenuAllListId(PlmPropertiesModelHeader properties);
+
     List<DictData> searchAllItemTypeList(PlmPropertiesItem propertiesItem);
 
     List<Map<String, Object>> searchAllTypeList();

src/main/resources/mapper/base/PropertiesMapper.xml

@@ -415,6 +415,14 @@
         from properties_type
     </select>
 
+    <select id="searchMenuAllListId" resultType="com.xujie.modules.sys.entity.SysMenuEntity">
+        select menu_id, name
+        from sys_menu
+        where parent_id = 0
+          and menu_id not in (999)
+          and menu_type = 'pc'
+    </select>
+
     <select id="getItemListsForPartAndCode" resultType="PlmPropertiesItemData">
         select a.PropertiesItemNo itemNo,
                b.ItemDesc