修复bug

dgtly-goods/dgtly-goods-admin/src/main/java/com/dgtly/goods/controller/GoodsInfoController.java

@@ -75,9 +75,6 @@ public class GoodsInfoController extends BaseController
         /*判断是否是系统内部人员*/
         if(ShiroUtils.getCompanyId()!=Long.parseLong(configService.selectConfigByKey("sys.company.id"))){
             goodsInfo.setCompanyId(ShiroUtils.getCompanyId());
-        }else{
-            /*系统内部人员只能查看已上架商品*/
-            goodsInfo.setPutawayFlag("1");
         }
 
         startPage();

dgtly-goods/dgtly-goods-admin/src/main/resources/templates/goods/info/info.html

@@ -21,12 +21,20 @@
                                 <input name="companyName" onclick="selectTree('company')" id="input_companyTreeName" type="text" placeholder="选择商户"
                                            class="form-control required" readonly="readonly" required>
                             </li>
+
                             <li>
                                 <p>所属类型：</p>
                                 <input name="typeId" type="hidden" id="input_typeId">
                                 <input name="typeName" onclick="selectTree('type')" id="input_typeTreeName" type="text" placeholder="选择商品分类"
                                        class="form-control required" readonly="readonly" required>
                             </li>
+                            <li>
+                                商品状态：
+                                <select name="putawayFlag" th:with="type=${@dict.getType('goods_putaway')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>