jiangjiazhi / center

Authored by fangcheng over 8 years ago

Exists in master

Showing 7 changed files with 11 additions and 10 deletions

...	...	@@ -45,7 +45,7 @@
45	45	@Transactional
46	46	public boolean updateRole(Roles role, List<RolePermissionMaps> rpList) {
47	47	EntityWrapper<RolePermissionMaps> ew = new EntityWrapper<RolePermissionMaps>();
48		- ew.where("role_id={0}", "'" + role.getId() + "'");
	48	+ ew.where("role_id={0}", role.getId());
49	49	baseMapper.updateById(role);
50	50	sysRolePermissionMapsService.delete(ew);
51	51	if (!rpList.isEmpty()) {

...	...	@@ -103,7 +103,7 @@
103	103
104	104	Integer tag = userMapper.updateById(user);
105	105	EntityWrapper<UserRoleMaps> ew = new EntityWrapper<UserRoleMaps>();
106		- ew.where("user_id={0}", "'" + user.getId() + "'");
	106	+ ew.where("user_id={0}", user.getId());
107	107	sysUserRoleMapsService.delete(ew);
108	108	if (!userRoleMapsList.isEmpty()) {
109	109	sysUserRoleMapsService.insertBatch(userRoleMapsList);
...	...	@@ -168,7 +168,7 @@
168	168	* <li>修改时间：
169	169	*/
170	170	private boolean isExistAccount(String account) {
171		- Users entity = selectOne(new EntityWrapper<Users>().where("account={0}", "'" + account + "'").and("ifDel=0"));
	171	+ Users entity = selectOne(new EntityWrapper<Users>().where("account={0}", account).and("ifDel=0"));
172	172	if (null == entity) {
173	173	return false;
174	174	}

...	...	@@ -88,7 +88,7 @@
88	88	model.addAttribute("role", role);
89	89	// 当前用户权限数据
90	90	List<RolePermissionMaps> rpList = sysRolePermissionMapsService
91		- .selectList(new EntityWrapper<RolePermissionMaps>().where("role_id={0}", "'" + id + "'"));
	91	+ .selectList(new EntityWrapper<RolePermissionMaps>().where("role_id={0}",id));
92	92	StringBuilder permissionSB = new StringBuilder();
93	93	for (RolePermissionMaps rpEntity : rpList) {
94	94	permissionSB.append("," + rpEntity.getPermissionId());

...	...	@@ -119,7 +119,7 @@
119	119	model.addAttribute("user", user);
120	120	// 当前用户角色数据
121	121	List<UserRoleMaps> urList = sysUserRoleMapsService
122		- .selectList(new EntityWrapper<UserRoleMaps>().where("user_id={0}", "'" + id + "'"));
	122	+ .selectList(new EntityWrapper<UserRoleMaps>().where("user_id={0}", id ));
123	123	StringBuilder urSB = new StringBuilder();
124	124	for (UserRoleMaps urEntity : urList) {
125	125	urSB.append("," + urEntity.getRoleId());

...	...	@@ -77,6 +77,7 @@
77	77	* @return
78	78	*/
79	79	protected String getParameter(String name) {
	80	+ request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
80	81	return request.getParameter(name);
81	82	}
82	83

...	...	@@ -32,7 +32,7 @@
32	32	EntityWrapper<HistorySource> ew = new EntityWrapper<HistorySource>();
33	33	ew.where("enable=1");
34	34	if(historyPatientType.length > 0){
35		- ew.and("type={0}", "'"+historyPatientType[0]+"'");
	35	+ ew.and("type={0}", historyPatientType[0]);
36	36	}
37	37	ew.orderBy("itemorder");
38	38	dataList = selectList(ew);

...	...	@@ -48,11 +48,11 @@
48	48
49	49	// strategy.setInclude(new String[] {
50	50	// "SYS_USERS","SYS_USER_ROLE_MAPS","SYS_ROLES" }); // 需要生成的表
51		- strategy.setInclude(new String[] { "DIAGNOSE_VERSION", "DIAGNOSE_SOURCE", "DIAGNOSE_CONF" }); // 需要生成的表
	51	+ strategy.setInclude(new String[] { "SYS_ORGANIZATIONS_CONF"}); // 需要生成的表
52	52	// pc.setParent("com.lyms.hospital");
53	53	pc.setParent("com.lyms.base.common");
54	54
55		- pc.setFunctionName("conf"); // com.lyms.hospital.web.controller.sys
	55	+ pc.setFunctionName("organ"); // com.lyms.hospital.web.controller.sys
56	56	// 加在controller后面
57	57	// pc.setModuleName("sys"); //com.lyms.hospital.sys.controller
58	58	// 加在controller前面
59	59
...	...	@@ -103,9 +103,9 @@
103	103	DataSourceConfig dsc = new DataSourceConfig();
104	104	dsc.setDbType(DbType.MYSQL);
105	105	dsc.setDriverName("com.mysql.jdbc.Driver");
106		- dsc.setUsername("hospital");
	106	+ dsc.setUsername("center");
107	107	dsc.setPassword("lyms2015");
108		- dsc.setUrl("jdbc:mysql://119.90.57.26:3306/hospital?characterEncoding=utf8");
	108	+ dsc.setUrl("jdbc:mysql://119.90.57.26:3306/center?characterEncoding=utf8");
109	109	mpg.setDataSource(dsc);
110	110
111	111	// 策略配置