Просмотр исходного кода

Merge remote-tracking branch 'origin/test'

Michael_9527 лет назад: 8
Родитель
Сommit
811043daa2

+ 1 - 1
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -398,7 +398,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		List<AchievementKeyword> AchievementKeywordList = new ArrayList<>();
 		List<AchievementKeyword> AchievementKeywordList = new ArrayList<>();
 		Calendar now = Calendar.getInstance();
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
 		now.set(Calendar.MILLISECOND, 0);
-		String techBrokerId = TokenManager.hasRole(AFTConstants.TECHBROKER) ? TokenManager.getAdminId() : null;
+		String techBrokerId = TokenManager.getAdminId();
 		for (AchievementImportBo bo : data) {
 		for (AchievementImportBo bo : data) {
 			a = new Achievement();
 			a = new Achievement();
 			BeanUtils.copyProperties(bo, a);
 			BeanUtils.copyProperties(bo, a);

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

@@ -122,7 +122,6 @@ import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.copyright.bo.CopyrightInfoDetail;
 import com.goafanti.copyright.bo.CopyrightInfoDetail;
 import com.goafanti.copyright.service.CopyrightInfoService;
 import com.goafanti.copyright.service.CopyrightInfoService;
-import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.easemob.EasemobUtils;
 import com.goafanti.easemob.EasemobUtils;
 import com.goafanti.easemob.enums.EasemonSysUsers;
 import com.goafanti.easemob.enums.EasemonSysUsers;
@@ -131,9 +130,7 @@ import com.goafanti.user.bo.InputOrganizationIdentity;
 import com.goafanti.user.bo.InputUser;
 import com.goafanti.user.bo.InputUser;
 import com.goafanti.user.bo.InputUserAbility;
 import com.goafanti.user.bo.InputUserAbility;
 import com.goafanti.user.bo.InputUserIdentity;
 import com.goafanti.user.bo.InputUserIdentity;
-import com.goafanti.user.bo.OrgListBo;
 import com.goafanti.user.bo.OrgUnitNames;
 import com.goafanti.user.bo.OrgUnitNames;
-import com.goafanti.user.bo.UserListBo;
 import com.goafanti.user.service.OrgHumanResourceService;
 import com.goafanti.user.service.OrgHumanResourceService;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.UserAbilityService;
 import com.goafanti.user.service.UserAbilityService;

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

@@ -1157,7 +1157,7 @@
     	 name, keyword, category,
     	 name, keyword, category,
     	 owner_name, owner_type, owner_id_number,
     	 owner_name, owner_type, owner_id_number,
     	 owner_mobile, owner_email, owner_postal_address,
     	 owner_mobile, owner_email, owner_postal_address,
-    	 cooperation_mode, introduction
+    	 cooperation_mode, introduction, tech_broker_id
     	 )
     	 )
     values 
     values 
     <foreach item="item" index="index" collection="list" separator=",">
     <foreach item="item" index="index" collection="list" separator=",">
@@ -1167,7 +1167,7 @@
       	#{item.name,jdbcType=VARCHAR}, #{item.keyword,jdbcType=VARCHAR}, #{item.category,jdbcType=INTEGER},
       	#{item.name,jdbcType=VARCHAR}, #{item.keyword,jdbcType=VARCHAR}, #{item.category,jdbcType=INTEGER},
       	#{item.ownerName,jdbcType=VARCHAR}, #{item.ownerType,jdbcType=VARCHAR}, #{item.ownerIdNumber,jdbcType=VARCHAR},
       	#{item.ownerName,jdbcType=VARCHAR}, #{item.ownerType,jdbcType=VARCHAR}, #{item.ownerIdNumber,jdbcType=VARCHAR},
       	#{item.ownerMobile,jdbcType=VARCHAR}, #{item.ownerEmail,jdbcType=VARCHAR}, #{item.ownerPostalAddress,jdbcType=VARCHAR},
       	#{item.ownerMobile,jdbcType=VARCHAR}, #{item.ownerEmail,jdbcType=VARCHAR}, #{item.ownerPostalAddress,jdbcType=VARCHAR},
-      	#{item.cooperationMode,jdbcType=INTEGER}, #{item.introduction,jdbcType=LONGVARCHAR}
+      	#{item.cooperationMode,jdbcType=INTEGER}, #{item.introduction,jdbcType=LONGVARCHAR},#{item.techBrokerId,jdbcType=VARCHAR}
       )
       )
     </foreach>
     </foreach>
   </insert>
   </insert>

+ 2 - 5
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -769,9 +769,6 @@
 	<if test="adminId != null">
 	<if test="adminId != null">
 		LEFT JOIN user u on d.employer_id = u.id
 		LEFT JOIN user u on d.employer_id = u.id
 	</if>
 	</if>
-	<if test="adminId != null">
-		LEFT JOIN user u on d.employer_id = u.id
-	</if>
 	<if test="hot != null and hot == 1"><!-- 在首页 -->
 	<if test="hot != null and hot == 1"><!-- 在首页 -->
 		inner join marketing_management mm on d.id = mm.product_id
 		inner join marketing_management mm on d.id = mm.product_id
 	</if>
 	</if>
@@ -1001,7 +998,7 @@
     	status, release_status, create_time, 
     	status, release_status, create_time, 
     	keyword, data_category, name,
     	keyword, data_category, name,
     	demand_type, problem_des, employer_name,
     	demand_type, problem_des, employer_name,
-    	employer_contacts, employer_contacts_mobile, employer_contacts_mailbox, info_sources)
+    	employer_contacts, employer_contacts_mobile, employer_contacts_mailbox, info_sources,tech_broker_id)
     values 
     values 
     <foreach item="item" index="index" collection="list" separator=",">
     <foreach item="item" index="index" collection="list" separator=",">
       (
       (
@@ -1010,7 +1007,7 @@
       	#{item.keyword,jdbcType=VARCHAR}, #{item.dataCategory,jdbcType=INTEGER}, #{item.name,jdbcType=VARCHAR},
       	#{item.keyword,jdbcType=VARCHAR}, #{item.dataCategory,jdbcType=INTEGER}, #{item.name,jdbcType=VARCHAR},
       	#{item.demandType,jdbcType=INTEGER}, #{item.problemDes,jdbcType=VARCHAR}, #{item.employerName,jdbcType=VARCHAR},
       	#{item.demandType,jdbcType=INTEGER}, #{item.problemDes,jdbcType=VARCHAR}, #{item.employerName,jdbcType=VARCHAR},
       	#{item.employerContacts,jdbcType=VARCHAR}, #{item.employerContactsMobile,jdbcType=VARCHAR}, #{item.employerContactsMailbox,jdbcType=VARCHAR},
       	#{item.employerContacts,jdbcType=VARCHAR}, #{item.employerContactsMobile,jdbcType=VARCHAR}, #{item.employerContactsMailbox,jdbcType=VARCHAR},
-      	#{item.infoSources,jdbcType=INTEGER}
+      	#{item.infoSources,jdbcType=INTEGER},#{item.techBrokerId,jdbcType=VARCHAR}
       )
       )
     </foreach>
     </foreach>
   </insert>
   </insert>

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

@@ -139,7 +139,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			Integer province, Integer serialNumber, String name, String keyword, Integer infoSources,
 			Integer province, Integer serialNumber, String name, String keyword, Integer infoSources,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, String username,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, String username,
 			Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo,
 			Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo,
-			Integer pSize, Integer boutique, Integer hot,String techBrokerId) {
+			Integer pSize, Integer boutique, Integer hot, String techBrokerId) {
 		Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
 		Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
 				demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
 				demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
 				releaseDateStartDate, releaseDateEndDate, boutique, hot);
 				releaseDateStartDate, releaseDateEndDate, boutique, hot);
@@ -412,7 +412,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		List<DemandKeyword> demandKeywordList = new ArrayList<>();
 		List<DemandKeyword> demandKeywordList = new ArrayList<>();
 		Calendar now = Calendar.getInstance();
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
 		now.set(Calendar.MILLISECOND, 0);
-		String techBrokerId = TokenManager.hasRole(AFTConstants.TECHBROKER) ? TokenManager.getAdminId() : null;
+		String techBrokerId = TokenManager.getAdminId();
 		for (DemandImportBo bo : data) {
 		for (DemandImportBo bo : data) {
 			d = new Demand();
 			d = new Demand();
 			BeanUtils.copyProperties(bo, d);
 			BeanUtils.copyProperties(bo, d);