jiangjiazhi / regional-platform

Authored by liquanyu almost 9 years ago

Exists in master and in 8 other branches

Showing 3 changed files

...	...	@@ -59,6 +59,9 @@
59	59	<if test="shortCode != null">
60	60	shortCode = #{shortCode,jdbcType=VARCHAR},
61	61	</if>
	62	+ <if test="orgid != null">
	63	+ orgid =#{orgid,jdbcType=INTEGER},
	64	+ </if>
62	65	</set>
63	66	where id = #{id,jdbcType=INTEGER}
64	67	</update>
...	...	@@ -70,7 +73,7 @@
70	73
71	74
72	75	<select id="getRoles" resultMap="RolesResultMap" parameterType="java.lang.Integer">
73		-select id,type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode
	76	+select id,type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode,orgid
74	77	from roles where id = #{id,jdbcType=INTEGER}
75	78	</select>
76	79
...	...	@@ -129,6 +132,9 @@
129	132	</if>
130	133	<if test="keyword != null and keyword != ''">
131	134	and name like CONCAT(#{keyword}, '%')
	135	+ </if>
	136	+ <if test="orgid != null">
	137	+ and orgid =#{orgid,jdbcType=INTEGER}
132	138	</if>
133	139	</where>
134	140	</sql>

...	...	@@ -234,7 +234,8 @@
234	234	@RequestParam(value = "name", required = false) String name,
235	235	@RequestParam(value = "enable", required = false) Integer enable,
236	236	@RequestParam(value = "remarks", required = false) String remarks,
237		- @RequestParam(value = "shortCode", required = false) String shortCode) {
	237	+ @RequestParam(value = "shortCode", required = false) String shortCode,
	238	+ @RequestParam(value = "orgId")Integer orgId) {
238	239
239	240	if (StringUtils.isBlank(name) \|\| null == id) {
240	241	ResultUtils.buildParameterErrorResultAndWrite(response);
...	...	@@ -268,7 +269,7 @@
268	269	return;
269	270	}
270	271	}
271		-
	272	+ roles.setOrgId(orgId);
272	273	roles.setName(name);
273	274	roles.setEnable(enable);
274	275	roles.setRemarks(remarks);

...	...	@@ -50,6 +50,8 @@
50	50	private BasicConfigService basicConfigService;
51	51	@Autowired
52	52	private AutoMatchFacade autoMatchFacade;
	53	+ @Autowired
	54	+ private PersonService personService;
53	55
54	56
55	57	/**
...	...	@@ -86,6 +88,13 @@
86	88	babyModel.setParentId(parentId);
87	89	babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女"));
88	90	babyModel.setYn(YnEnums.YES.getId());
	91	+
	92	+ PersonModel personModel=new PersonModel();
	93	+ personModel.setType(2);
	94	+ personModel.setYn(YnEnums.YES.getId());
	95	+ personModel.setBirth(DateUtil.parseYMD(deliverAddRequest.getDueDate()));
	96	+ personModel.setModified(new Date());
	97	+ babyModel.setPid(personService.addPerson(personModel).getId());
89	98	babyIds.add(babyService.addOneBaby(babyModel).getId());
90	99	}
91	100	}