Browse Source

解决专家机构不能修改的问题,新增专家和专家信息修改增加机构修改的判断,如果不存在该机构则创建新机构。

zzy.zhiyuan.foxmail 8 years ago
parent
commit
156650ab14

+ 2 - 1
src/main/java/com/ekexiu/portal/po/Professor.java

@ -3,6 +3,7 @@ package com.ekexiu.portal.po;
3 3
import org.jfw.apt.orm.annotation.entry.Column;
4 4
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
5 5
import org.jfw.apt.orm.annotation.entry.Table;
6
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
6 7
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
7 8
import org.jfw.apt.orm.core.enums.DE;
8 9
@ -97,7 +98,7 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
97 98
	 * 任职机构ID
98 99
	 * @return
99 100
	 */
100
	@Column(DE.id_32)
101
	@Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",insertable=true,nullable=false,renewable=true,queryable=true)
101 102
	public String getOrgId() {
102 103
		return orgId;
103 104
	}

+ 10 - 2
src/main/java/com/ekexiu/portal/service/ProfessorService.java

@ -172,7 +172,11 @@ public class ProfessorService {
172 172
		}
173 173
		professor.setAuthentication(true);
174 174
		if (professor.getOrgId() == null) {
175
			professor.setOrgId(this.orgService.createOrganization(con, orgName));
175
			if(null != this.orgDao.queryByName(con, orgName)){
176
				professor.setOrgId(this.orgDao.queryByName(con, orgName));
177
			} else {
178
				professor.setOrgId(this.orgService.createOrganization(con, orgName));
179
			}
176 180
		}
177 181
		this.professorDao.insert(con, professor);
178 182
		this.imageService.saveDefaultHeadImage(professor.getId());
@ -183,7 +187,11 @@ public class ProfessorService {
183 187
	@Path
184 188
	public void update(@JdbcConn(true) Connection con, @RequestBody EditProfessor professor) throws SQLException, IOException {
185 189
		if(professor.getOrgName()!=null)
186
			professor.setOrgId(this.orgService.createOrganization(con, professor.getOrgName()));
190
			if(null != this.orgDao.queryByName(con, professor.getOrgName())){
191
				professor.setOrgId(this.orgDao.queryByName(con, professor.getOrgName()));
192
			} else {
193
				professor.setOrgId(this.orgService.createOrganization(con, professor.getOrgName()));
194
			}
187 195
		this.professorDao.update(con, professor);
188 196
	}
189 197