解决分配仓库不展示的bug

jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java

@@ -116,6 +116,8 @@ public class DepotService {
         Depot depot = JSONObject.parseObject(obj.toJSONString(), Depot.class);
         int result=0;
         try{
+            depot.setType(0);
+            depot.setIsDefault(false);
             result=depotMapper.insertSelective(depot);
             logService.insertLog("仓库",
                     new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(depot.getName()).toString(), request);

jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml

@@ -132,7 +132,7 @@
     </select>
 
     <select id="findMaterialsListByHeaderId" resultType="java.lang.String">
-        select group_concat(concat(jsh_material.name,' ',jsh_material.standard,' ',jsh_material.model)) as mName
+        select group_concat(concat(jsh_material.name,' ',ifnull(jsh_material.standard,''),' ',ifnull(jsh_material.model,''))) as mName
         from jsh_depot_item
         inner join jsh_material on jsh_depot_item.material_id = jsh_material.Id and ifnull(jsh_material.delete_Flag,'0') !='1'
         where jsh_depot_item.header_id = ${id}