Antiloveg 8 years ago
parent
commit
63c55ff46e

+ 9 - 0
src/main/java/com/goafanti/admin/controller/AdminBigShotApiController.java

@@ -0,0 +1,9 @@
+package com.goafanti.admin.controller;
+
+import com.goafanti.common.controller.BaseApiController;
+/**
+ * 大咖说首页
+ */
+public class AdminBigShotApiController extends BaseApiController{
+		
+}

+ 9 - 0
src/main/java/com/goafanti/admin/controller/AdminLectureApiController.java

@@ -0,0 +1,9 @@
+package com.goafanti.admin.controller;
+
+import com.goafanti.common.controller.BaseApiController;
+/**
+ * 科技讲堂
+ */
+public class AdminLectureApiController extends BaseApiController {
+
+}

+ 9 - 0
src/main/java/com/goafanti/admin/controller/AdminStarApiController.java

@@ -0,0 +1,9 @@
+package com.goafanti.admin.controller;
+
+import com.goafanti.common.controller.BaseApiController;
+/**
+ * 科技明星
+ */
+public class AdminStarApiController extends BaseApiController{
+
+}

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

@@ -163,6 +163,11 @@ public class WebpageController extends BaseController {
 	public ModelAndView adminHome(HttpServletRequest request, ModelAndView modelview) {
 		return adminToLogin(request, modelview, "/admin/index");
 	}
+	
+	@RequestMapping(value = "/admin/idea", method = RequestMethod.GET)
+	public ModelAndView adminIdea(HttpServletRequest request, ModelAndView modelview) {
+		return adminToLogin(request, modelview, "/admin/idea");
+	}
 
 	@RequestMapping(value = "/portal/search/achievement", method = RequestMethod.GET)
 	public ModelAndView portalSearchAchievement(HttpServletRequest request, ModelAndView modelview) {

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

@@ -1056,7 +1056,7 @@
 		from user u 
 		LEFT JOIN organization_identity oi on oi.uid = u.id
 		LEFT JOIN org_ratepay ratepay on ratepay.uid = u.id and ratepay.year = #{year,jdbcType=INTEGER} and deleted_sign = 0
-		where uid = #{uid,jdbcType=VARCHAR}
+		where u.id = #{uid,jdbcType=VARCHAR}
 	</select>
 	
 	<select id="selectManagerUnitNames" resultType="com.goafanti.user.bo.OrgUnitNames"

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

@@ -43,9 +43,9 @@ public class OrganizationInfoServiceImpl implements OrganizationInfoService {
 	@Override
 	public int insertInfoAndPro(OrganizationInfo oi, OrganizationProperties op) {
 		OrganizationInfo o = organizationInfoMapper.selectOrgInfoByUserId(TokenManager.getUserId());
+		oi.setUid(TokenManager.getUserId());
 		if (null == o && StringUtils.isBlank(oi.getId())) {
 			oi.setId(UUID.randomUUID().toString());
-			oi.setUid(TokenManager.getUserId());
 			organizationInfoMapper.insert(oi);
 		} else if (null != o && StringUtils.isNotBlank(oi.getId())) {
 			organizationInfoMapper.updateByPrimaryKeySelective(oi);