jiangjiazhi / regional-platform | GitLab

Commit 4c5bb9102eae3069717b97f8e56a96bf55217fd1

Authored by liquanyu almost 9 years ago

1 parent de76806fe8

Exists in master and in 8 other branches

基础配置状态

Showing 3 changed files with 3 additions and 2 deletions

platform-biz-service/src/main/resources/mainOrm/Organization.xml
platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java

...	...	@@ -99,7 +99,7 @@
99	99
100	100
101	101	<select id="getOrganization" resultMap="OrganizationResultMap" parameterType="java.lang.Integer">
102		-select id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id
	102	+select id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id,status
103	103	from organization where id = #{id,jdbcType=INTEGER}
104	104	</select>
105	105

...	...	@@ -50,6 +50,7 @@
50	50	//高危配置
51	51	private String highConfig;
52	52
	53	+
53	54	public String getHighConfig() {
54	55	return highConfig;
55	56	}

...	...	@@ -378,7 +378,7 @@
378	378	String address = org.getAddress();
379	379	allAddress+=address;
380	380	hospital.put("address", allAddress);
381		- hospital.put("status",org.getStatus()+"");
	381	+ hospital.put("status",org.getStatus() == null ? "" : String.valueOf(org.getStatus()));
382	382	hospital.put("remark", "");
383	383	}
384	384	SmsConfigQuery query = new SmsConfigQuery();