代储bug修改

src/main/java/com/chinaitop/depot/agent/basic/controller/AgentDepotController.java

@@ -81,13 +81,16 @@ public class AgentDepotController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "agentDepotName", value = "代储库名称", paramType = "query"),
             @ApiImplicitParam(name = "agentId", value = "代储点id", paramType = "query"),
-            @ApiImplicitParam(name = "orgid", value = "组织id", paramType = "query")
+            @ApiImplicitParam(name = "orgid", value = "组织id", paramType = "query"),
+            @ApiImplicitParam(name = "addState", value = "添加状态", paramType = "query")
     })
-    public List<BusinessAgentDepot> getAgentDepotHouse(String agentDepotName,String orgid, String agentId){
+    public List<BusinessAgentDepot> getAgentDepotHouse(String agentDepotName,String orgid, String agentId, String addState){
         BusinessAgentDepotExample example = new BusinessAgentDepotExample();
         BusinessAgentDepotExample.Criteria criteria = example.createCriteria();
         criteria.andOrgIdEqualTo(Integer.parseInt(orgid));
-        criteria.andDepotIdEqualTo(0);
+        if(ParameterUtil.isnull(addState) || ParameterUtil.isequal(addState,"0")){
+            criteria.andDepotIdEqualTo(0);
+        }
         criteria.andDelFlagEqualTo(1);
         if(ParameterUtil.isnotnull(agentDepotName)){
             criteria.andAgentDepotNameLike("%" + agentDepotName + "%");

src/main/java/com/chinaitop/depot/agent/number/mapper/BusinessAgentNumberMapper.xml

@@ -360,8 +360,8 @@
     depot.agent_depot_name agentDepotName
     FROM
     business_agent_number num
-    LEFT JOIN business_agent agent ON agent.id = num.agent_id AND agent.org_id = #{orgId,jdbcType=INTEGER}
-    LEFT JOIN business_agent_depot depot ON depot.id = num.agent_depot_id AND depot.org_id = #{orgId,jdbcType=INTEGER}
+    LEFT JOIN business_agent agent ON agent.id = num.agent_id AND agent.del_flag = 1 AND agent.org_id = #{orgId,jdbcType=INTEGER}
+    LEFT JOIN business_agent_depot depot ON depot.id = num.agent_depot_id AND depot.del_flag = 1 AND depot.org_id = #{orgId,jdbcType=INTEGER}
     LEFT JOIN basic_storehouse store ON store.storehouse_id = num.storehouse_id
     LEFT JOIN basic_warehouse ware ON ware.warehouse_id = num.warehouse_id
     WHERE num.org_id = #{orgId,jdbcType=INTEGER}
@@ -377,6 +377,6 @@
     <if test="warehouseId != null">
       AND num.warehouse_id = #{warehouseId,jdbcType=INTEGER}
     </if>
-    order by num.updatetime desc
+    order by num.create_time desc
   </select>
 </mapper>