limin 7 years ago
parent
commit
a274c666e4

+ 31 - 1
.project

@@ -5,8 +5,38 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
 </projectDescription>
-<!-- -->

+ 1 - 0
src/main/java/com/goafanti/user/service/UserIdentityService.java

@@ -2,6 +2,7 @@ package com.goafanti.user.service;
 
 import java.util.List;
 
+import com.goafanti.app.bo.ExpertsListBo;
 import com.goafanti.app.bo.consultantListBo;
 import com.goafanti.common.bo.ReletivelyIndustry;
 import com.goafanti.common.bo.Result;

+ 9 - 8
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.app.bo.ExpertsListBo;
 import com.goafanti.app.bo.consultantListBo;
 import com.goafanti.common.bo.ReletivelyIndustry;
 import com.goafanti.common.bo.Result;
@@ -213,7 +214,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 				"findSearchSubscriberCount", params, pNo, pSize);
 	}
 
-	// 给业务员及客户经理发送�?�知
+	// 给业务员及客户经理发送�?�知
 	private void createNotice(User u, Integer status) {
 		if (!StringUtils.isBlank(u.getAid())) {
 			Notice n = new Notice();
@@ -235,7 +236,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 
 	}
 
-	// 给所有审核员发�?�审核�?�知
+	// 扈呎園譛牙ョ。譬ク蜻伜書�ス?�ス螳。譬ク�ス?�ス遏・
 	private void createAuditorNotice(User u) {
 		List<String> ids = userRoleMapper.listAuditor();
 		List<Notice> list = new ArrayList<>();
@@ -403,10 +404,10 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 	@Override
 	public List<Advertisings> advertising() {
 		List<String> a=new ArrayList<>();
-		a.add("蜈ウ莠主シ?螻?2018蟷エ蠎ヲ鬮俶眠謚?譛ッ莨∽ク夊ョ、螳壻ク馴。ケ螳。隶。譛コ譫�筏謚・蟾・菴懃噪騾夂衍");
-		a.add("转发四川省经济和信息化委员会关于��?��?2017年上市补助申报�?�知的�?�知");
-		a.add("关于组织企业参加第十三届中国重庆高新�?术成果交易会暨第九届中国国际军民两用�?术博览会的�?�知");
-		a.add("关于组织参加第十三届中国重庆高新�?术交易会暨第九届中国国际军民两用�?术博览会的�?�知");
+		a.add("蜈ウ莠趣ソス?�ス?2018蟷エ蠎ヲ鬮俶眠�ス?譛ッ莨∽ク夊ョ、螳壻ク馴。ケ螳。隶。譛コ譫�筏謚・蟾・菴懃噪騾夂衍");
+		a.add("霓ャ蜿大屁蟾晉怐扈乗オ主柱菫。諱ッ蛹門ァ泌遭莨壼�莠趣ソス?�ス?2017蟷エ荳雁クり。・蜉ゥ逕ウ謚・�ス?�ス遏・逧�ソス?�ス遏・");
+		a.add("关于组织企业参加第十三届中国重庆高新�?术成果交易会暨第九届中国国际军民两用�?术博览会的�?�知");
+		a.add("关于组织参加第十三届中国重庆高新�?术交易会暨第九届中国国际军民两用�?术博览会的�?�知");
 		List<Advertisings> ads=new ArrayList<>();
 		int i=0;
 		List<String> l=new ArrayList<>();
@@ -503,7 +504,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 		if(pageNo==null || pageNo<1)pageNo=1;
 		if(pageSize==null ||pageSize<1)pageSize=10; 
 		Map<String, Object> params=new HashMap<String,Object>();
-		//蟆�衍隸「蜿よ焚蠑�芦map?
+		//蟆�衍隸「蜿よ焚蠑�芦map�ス?
 		if(null != identity.getExpertAudit()) params.put("expertAudit", identity.getExpertAudit());
 		if(null != identity.getIndustry()) params.put("industry", identity.getIndustry());
 		if(null != identity.getExpert())  params.put("expert", identity.getExpert());
@@ -514,7 +515,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 
 	@Override
 	public UserIdentity getUserIdentityByUid(String uid) {
-		//闔キ蠕礼畑謌キ逧�ョ、隸∽ソ。?
+		//闔キ蠕礼畑謌キ逧�ョ、隸∽ソ。�ス?
 		UserIdentity u = userIdentityMapper.selectUserIdentityByUserId(uid);
 		return u;
 	}