Browse Source

Merge branch 'test'

anderx 2 years ago
parent
commit
2a692573bd

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

@@ -132,6 +132,7 @@
   </update>
 
 
+
   <select id="selectByPrid" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />

+ 2 - 3
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -341,7 +341,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				PublicExamine pe=new PublicExamine();
 				pe.setPrid(in.getId());
 				pe.setStatus(0);
-				publicExamineMapper.updateStatusByPrid(pe);
+				publicExamineMapper.updateByPridSelective(pe);
 			}
 			AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 
@@ -1169,7 +1169,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			throw new BusinessException("转换异常");
 		}
 		List<Integer> is=publicReleaseMapper.checkTime(TokenManager.getAdminId(),in.getReleaseStart(),in.getReleaseEnd());
-		if (is.size()>=1) {
+		if (is.size()>1) {
 			return true;
 		}else  if(is.size()==1){
 			//如果id为新增那么直接不允许时间重复
@@ -1179,7 +1179,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				//如果有id,与获取id一直,则为当前修改可以
 				if (in.getId().equals(is.get(0))){
 					return false;
-
 				}else {
 					return true;
 				}

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -52,7 +52,7 @@ amb.maxLvl=6
 
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.85
+static.host=//static.jishutao.com/1.2.86
 rd.static.host=//static.jishutao.com/RD/1.0.01
 avatar.upload.host=//static.jishutao.com/upload