Antiloveg 8 years ago
parent
commit
a8a85c8339

+ 1 - 1
schema/2017-04-14.sql

@@ -21,7 +21,7 @@ add COLUMN  `high_tech_name` VARCHAR(32) NULL COMMENT '国家级高新区名称'
 
 alter table `organization_identity` 
 MODIFY COLUMN `registered_capital` DECIMAL(8,2) NULL COMMENT '注册资金' ,
-MODIFY COLUMN `contacts` VARCAHR(16) NULL COMMENT '联系人' ;
+MODIFY COLUMN `contacts` VARCHAR(16) NULL COMMENT '联系人' ;
 
 
 

+ 3 - 2
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -129,6 +129,7 @@ import com.goafanti.user.bo.InputUser;
 import com.goafanti.user.bo.InputUserAbility;
 import com.goafanti.user.bo.InputUserIdentity;
 import com.goafanti.user.bo.OrgListBo;
+import com.goafanti.user.bo.OrgUnitNames;
 import com.goafanti.user.bo.UserListBo;
 import com.goafanti.user.service.OrgHumanResourceService;
 import com.goafanti.user.service.OrganizationIdentityService;
@@ -2884,9 +2885,9 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/getUnitNames", method = RequestMethod.GET)
 	public Result getUnitNames() {
 		Result res = new Result();
-		List<OrganizationIdentity> list = organizationIdentityService.selectAllOrgIndentity();
+		List<OrgUnitNames> list = organizationIdentityService.selectAllOrgIndentity();
 		Map<String, String> map = new TreeMap<String, String>();
-		for (OrganizationIdentity o : list) {
+		for (OrgUnitNames o : list) {
 			map.put(o.getUid(), o.getUnitName());
 		}
 		res.setData(map);

+ 2 - 1
src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.user.bo.OrgBasicInfoBo;
 import com.goafanti.user.bo.OrgIdentityBo;
+import com.goafanti.user.bo.OrgUnitNames;
 
 public interface OrganizationIdentityMapper {
     int deleteByPrimaryKey(String id);
@@ -23,7 +24,7 @@ public interface OrganizationIdentityMapper {
 
 	OrgIdentityBo selectOrgIdentityBoByUserId(String uid);
 
-	List<OrganizationIdentity> selectAllOrgIndentity(String aid);
+	List<OrgUnitNames> selectAllOrgIndentity(String aid);
 
 	OrgBasicInfoBo selectBasicInfo(String uid, int year);
 }

+ 1 - 1
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -895,7 +895,7 @@
 		where t.uid=#{uid,jdbcType=VARCHAR}
 	</select>
 
-	<select id="selectAllOrgIndentity" resultMap="BaseResultMap" parameterType="java.lang.String">
+	<select id="selectAllOrgIndentity" resultType="com.goafanti.user.bo.OrgUnitNames" parameterType="java.lang.String">
 		select u.id as uid, i.unit_name as unitName
 		from user u INNER JOIN organization_identity i on u.id = i.uid and u.lvl = 1
 		and i.audit_status = 5

+ 2 - 4
src/main/java/com/goafanti/patent/controller/PatentApiController.java

@@ -3,7 +3,6 @@ package com.goafanti.patent.controller;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeMap;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -28,7 +27,6 @@ import com.goafanti.common.enums.PatentInfoFields;
 import com.goafanti.common.enums.PatentInfoStatus;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.AftFile;
-import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.common.model.PatentInfo;
 import com.goafanti.common.model.PatentLog;
 import com.goafanti.common.model.User;
@@ -298,7 +296,7 @@ public class PatentApiController extends CertifyApiController {
 
 	/**
 	 * 获取公司
-	 */
+	 *//*
 	@RequestMapping(value = "/getUnitNames", method = RequestMethod.GET)
 	public Result getUnitNames() {
 		Result res = new Result();
@@ -309,7 +307,7 @@ public class PatentApiController extends CertifyApiController {
 		}
 		res.setData(map);
 		return res;
-	}
+	}*/
 
 	/**
 	 * 获取管理员

+ 26 - 0
src/main/java/com/goafanti/user/bo/OrgUnitNames.java

@@ -0,0 +1,26 @@
+package com.goafanti.user.bo;
+
+public class OrgUnitNames {
+	private String uid;
+	
+	private String unitName;
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
+	
+	
+
+}

+ 2 - 1
src/main/java/com/goafanti/user/service/OrganizationIdentityService.java

@@ -8,6 +8,7 @@ import com.goafanti.common.model.OrgHumanResource;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.user.bo.OrgBasicInfoBo;
 import com.goafanti.user.bo.OrgIdentityBo;
+import com.goafanti.user.bo.OrgUnitNames;
 
 public interface OrganizationIdentityService {
 
@@ -19,7 +20,7 @@ public interface OrganizationIdentityService {
 
 	OrgIdentityBo selectOrgIdentityBoByUserId(String uid);
 
-	List<OrganizationIdentity> selectAllOrgIndentity();
+	List<OrgUnitNames> selectAllOrgIndentity();
 
 	int updateByPrimaryKey(OrganizationIdentity org);
 

+ 2 - 1
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -25,6 +25,7 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.user.bo.OrgBasicInfoBo;
 import com.goafanti.user.bo.OrgIdentityBo;
+import com.goafanti.user.bo.OrgUnitNames;
 import com.goafanti.user.service.OrganizationIdentityService;
 
 @Service
@@ -61,7 +62,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 	}
 
 	@Override
-	public List<OrganizationIdentity> selectAllOrgIndentity() {
+	public List<OrgUnitNames> selectAllOrgIndentity() {
 		String aid = null;
 		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
 			aid = TokenManager.getAdminId();