limin 7 years ago
parent
commit
9fdf2916d0

+ 3 - 3
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -117,7 +117,7 @@ public class WebpageController extends BaseController {
 
 	@RequestMapping(value = "/admin/login", method = RequestMethod.GET)
 	public String adminLogin(HttpServletRequest request, ModelAndView modelview) {
-		return "/admin/login";
+ 		return "/admin/login";
 	}
 
 	@RequestMapping(value = "/admin/demand", method = RequestMethod.GET)
@@ -221,10 +221,10 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/portal/index", method = RequestMethod.GET)
 	public ModelAndView portalIndex(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/index");
-		List<Banners> banners = bannersService.findPortalBanners(BannersType.SHOU_YE.getKey());
+		/*List<Banners> banners = bannersService.findPortalBanners(BannersType.SHOU_YE.getKey());
 		if (!banners.isEmpty()) {
 			modelview.addObject("banner", banners.get(0));
-		}
+		}*/
 		//政策
 		modelview.addObject("jtdt", newsService.findIndexNewsList(0, NewsType.JTDT.getCode(), 4));
 		//服务项目

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

@@ -1041,7 +1041,7 @@
 				group by  seller_id ) o on t.uid=o.seller_id
 	where expert=1
 	and u.status !=1
-	and t.expert_audit =2
+	and t.audit_status =2
 	<if test="industry != null">
         and t.industry = #{industry,jdbcType=VARCHAR}
     </if>

+ 0 - 2
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -766,7 +766,6 @@
 			b.audit_status as auditStatus,
 			b.graduate_school as graduateSchool,
 			b.consultation_price as consultationPrice,
-			b.expert_audit as expertAudit,
 			b.release_status as releaseStatus,
 			a.aid as aid,d.name as adminName
 		from
@@ -1276,7 +1275,6 @@
 			dg3.name as area,
 			c.name as industry,
 			d.name as adminName,
-			b.expert_audit as expertAudit,
 			b.release_status as releaseStatus
 		from user a inner join user_identity b on a.id = b.uid
 		left join district_glossory dg1 on b.province = dg1.id

+ 10 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -10,11 +10,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+
 import javax.annotation.Resource;
+
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.beanutils.PropertyUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
@@ -390,7 +394,12 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		UserIdentity ui = new UserIdentity();
 		User user = new User();
 		try {
-			BeanUtilsExt.copyProperties(ui, bo);
+			try {
+				PropertyUtils.copyProperties(ui,bo);
+			} catch (NoSuchMethodException e) {
+				e.printStackTrace();
+			}
+			//BeanUtilsExt.copyProperties(ui, bo);
 			user.setId(bo.getUid());
 			user.setSocietyTag(bo.getSocietyTag());
 			user.setHeadPortraitUrl(bo.getHeadPortraitUrl());

+ 10 - 2
src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java

@@ -31,10 +31,18 @@ public class AdminOrganizationController extends BaseApiController{
 		return res;		
 	}
 	/**部门组织管理上级组织查询 **/
-	@RequestMapping(value = "/selectSuperId" , method = RequestMethod.POST)
+	@RequestMapping(value = "/selectSuperId" , method = RequestMethod.GET)
 	public Result selectsuperId(){
 		Result res = new Result();
-		res.setData(organizationService.selectSuperId());
+		res.setData(organizationService.selectSuperId(0));
+		return res;
+	}
+	/**部门组织管理上级组织查询 **/
+	@RequestMapping(value = "/selectSuperIdS" , method = RequestMethod.GET)
+	public Result selectsuperIdS(){
+		Result res = new Result();
+		
+		res.setData(organizationService.selectSuperId(1));
 		return res;
 	}
 	/**部门组织管理新增**/

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -1,7 +1,7 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc:mysql://192.168.1.213:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc:mysql://192.168.0.17:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #\u5e10\u53f7
 jdbc.username=dev
 #\u5bc6\u7801
@@ -40,7 +40,7 @@ jdbc.filters=stat
 
 logging.level.com.goafanti=DEBUG
 
-jedis.host=127.0.0.1
+jedis.host=192.168.0.17
 jedis.port=6379
 jedis.timeout=5000
 jedis.password=aft123456

+ 6 - 6
src/main/webapp/WEB-INF/views/portal/index.html

@@ -48,7 +48,7 @@
 			</ul>
 		</div>
 	</div>
-	<div id="index_fruit">
+	<!-- <div id="index_fruit">
 			<div class="fruit_h3">
 				<h3>精品成果</h3>
 				<a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">MORE+</a>
@@ -113,8 +113,8 @@
 				
 			</div>
 		</div>
-		
-		<div id="index_demand">
+		 -->
+		<!-- <div id="index_demand">
 			<div class="fruit_h3">
 				<h3>精品需求</h3>
 				<a th:href="${basePath + '/portal/technologyTrading/demand.html'}">MORE+</a>
@@ -137,7 +137,7 @@
 					</a>
 				</div>										
 			</div>
-		</div>
+		</div> -->
 	<div id="index_policy">
 			<div class="fruit_h3">
 				<a th:href="${basePath + '/portal/thinkTank/policyList.html'}"><span>+</span> 更多政策</a>
@@ -203,7 +203,7 @@
 				</div>
 			</div>
 		</div>
-		<div id="index_man">
+		<!-- <div id="index_man">
 			<div class="index_man">
 				<img th:src="${portalHost+'/img/index_er6.png'}" alt="" />				
 				<div>
@@ -284,7 +284,7 @@
 					</span>
 				</div>
 			</div>	
-		</div>
+		</div> -->
 	
 	<footer>
 		<div th:replace="common::copyright"></div>