Browse Source

技术评估页面BUG修复

anderx 8 years ago
parent
commit
fe245cab3d

+ 1 - 1
src/main/java/com/goafanti/app/controller/AppAchievementDemandController.java

@@ -21,7 +21,7 @@ import com.goafanti.user.service.UserIdentityService;
 import com.goafanti.user.service.UserInterestService;
 
 @RestController
-@RequestMapping(path = "/open/api/open/achievementDemand", method = RequestMethod.GET)
+@RequestMapping(path = "/api/open/achievementDemand", method = RequestMethod.GET)
 public class AppAchievementDemandController extends BaseApiController {
 	@Resource
 	private BannersService		bannersService;

+ 2 - 2
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -791,8 +791,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			d.setIndustryCategory3(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryB()).getName()));
 		}
 		if (null!=d.getEmployerId()) {
-			System.out.println(userMapper.selectByPrimaryKey(d.getEmployerId()));
-			d.setCityname(districtGlossoryMapper.selectNameById(userIdentityMapper.selectAuditorUserIdentityByUserId(d.getEmployerId()).getCity()));
+			System.out.println();
+			d.setIndustryCategory3(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryB()).getName()));
 		}
 		return d;
 	}

+ 2 - 6
src/main/webapp/WEB-INF/views/portal/technologyTrading/assessMent.html

@@ -138,12 +138,8 @@
   		</div>
   		<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
   		<div class="process_btn">
-<<<<<<< HEAD
-  			<a href="/user/account/index.html#normal" >立即评估</a>
-=======
-  			<a>立即评估</a>
->>>>>>> branch 'patch' of https://git.coding.net/aft/AFT.git
-  			<a href="javascript:;" onclick="_MEIQIA('showPanel')">在线咨询</a>
+			<a href="/user/account/index.html#normal" >立即评估</a>
+			<a href="javascript:;" onclick="_MEIQIA('showPanel')">在线咨询</a>
   		</div>
   	</div>
   	<div class="services" id="services">