瀏覽代碼

Merge remote-tracking branch 'origin/master' into test

Conflicts:
	src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java
limin 7 年之前
父節點
當前提交
af7c399c4e

+ 7 - 0
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -416,4 +416,11 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(userIdentityService.updateAuditing(identity));
 		return res;
 	}
+	
+	//获得注册用户信息
+	@RequestMapping(value="/user/info", method = RequestMethod.GET)
+	public Result userInfo(User user, Integer pageNo, Integer pageSize){
+		Result res = new Result();
+		return res;
+	}
 }

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

@@ -9,7 +9,6 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.user.bo.OrgUnitNames;
 import com.goafanti.user.bo.UserBaseBo;
 import com.goafanti.user.bo.UserDownLoadBo;
-import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.bo.UserNames;
 import com.goafanti.user.bo.UserPageHomeBo;
 import com.goafanti.user.bo.UserPartnerDetailBo;
@@ -62,5 +61,7 @@ public interface UserService {
 
 	
 	
+	Pagination<User> userInfo(User user, Integer pageNo, Integer pageSize);
+	
 	
 }

+ 8 - 3
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -12,7 +12,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.goafanti.app.bo.UserBasicInfo;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.JpushEasemobAccountMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
 import com.goafanti.common.dao.UserMapper;
@@ -20,11 +19,9 @@ import com.goafanti.common.model.User;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.user.bo.ClientListBo;
 import com.goafanti.user.bo.OrgUnitNames;
 import com.goafanti.user.bo.UserBaseBo;
 import com.goafanti.user.bo.UserDownLoadBo;
-import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.bo.UserNames;
 import com.goafanti.user.bo.UserPageHomeBo;
 import com.goafanti.user.bo.UserPartnerDetailBo;
@@ -226,6 +223,14 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 	public Integer selectByMobieAndTypeCount(String mobile ) {
 		return userMapper.selectByMobieAndTypeCount(mobile);
 	}
+	@Override
+	public Pagination<User> userInfo(User user, Integer pageNo, Integer pageSize) {
+		Map<String,Object> map = new HashMap<String, Object>();
+		map.put("username", "");
+		map.put("mobile", "");
+		map.put("type", "");
+		return null;
+	}
 
 
 	

+ 2 - 2
src/main/webapp/WEB-INF/views/common.html

@@ -116,9 +116,9 @@
 					<p>
 						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexPolicy}">知识产权交易政策</a>
 					</p>
-					<p>
+					<!-- <p>
 						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexExpert}">权威专家</a>
-					</p>
+					</p> -->
 				</li>
 				<!-- <li>
 					<div>知识产权维权</div>

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/index.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html