Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java =================================================================== diff -u -r18185 -r19479 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 18185) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 19479) @@ -12,9 +12,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.forgon.entity.PageEntity; -import com.forgon.tools.util.PageUtil; - import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -33,6 +30,7 @@ import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock; import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; +import com.forgon.entity.PageEntity; import com.forgon.systemsetting.service.HttpOptionManager; import com.forgon.tools.Constants; import com.forgon.tools.GB2Alpha; @@ -42,6 +40,7 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JSONUtil; +import com.forgon.tools.util.PageUtil; import com.forgon.tools.util.SqlUtils; /** @@ -1283,11 +1282,8 @@ public void loadSupplyRoomConfig(){ int type = StrutsParamUtils.getPraramValue("type", -1); - JSONArray jsonArray = new JSONArray(); - List supplyRoomConfigList = supplyRoomConfigManager.getSupplyRoomList(type); - jsonArray = supplyRoomConfigListToJSONArray(supplyRoomConfigList); - StrutsResponseUtils.output(jsonArray); + StrutsResponseUtils.output(supplyRoomConfigListToJSONArray(supplyRoomConfigList)); } /**