咨询查询所有

cloud-site-api/src/main/java/com/yizhi/site/application/vo/site/InfomationParamVO.java

@@ -30,6 +30,8 @@ public class InfomationParamVO extends ContextVO {
 	
 	@ApiModelProperty(value="发布时间的终点")
 	private Date end;
+
+	private Long isTop;
 	
 	private Long siteId;
 

cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/DataClassificationServiceImpl.java

@@ -122,35 +122,38 @@ public class DataClassificationServiceImpl extends ServiceImpl<DataClassificatio
 			}*/
 		} else {
 			Map<String, Object> map = null;
-			for(ClassificationVO vo : list){
-				EntityWrapper<DataClassification> wrapper = new EntityWrapper<>();
-				wrapper.eq("state", 1);
-				wrapper.eq("parent_id", vo.getId());
-				List<DataClassification> selectByMap = dataClassificationService.selectList(wrapper);
-				List<DataClassificationVo> selectVoByMap=new ArrayList<>();
-				if (CollectionUtil.isNotEmpty(selectByMap)) {
-					for (DataClassification d : selectByMap) {
-						DataClassificationVo entityVo = new DataClassificationVo();
-						BeanUtils.copyProperties(d, entityVo);
-						selectVoByMap.add(entityVo);
-						
-						//获取子节点
-						EntityWrapper<DataClassification> wrapperChild = new EntityWrapper<>();
-						wrapperChild.eq("state", 1);
-						wrapperChild.eq("parent_id", entityVo.getId());
-						List<DataClassification> classificationChild = dataClassificationService.selectList(wrapperChild);
-						List<DataClassificationVo> childClassifyNews = new ArrayList<>();
-						if (CollectionUtil.isNotEmpty(classificationChild)) {
-							for (DataClassification child : classificationChild) {
-								DataClassificationVo entityChild = new DataClassificationVo();
-								BeanUtils.copyProperties(child, entityChild);
-								childClassifyNews.add(entityChild);
+			for(ClassificationVO vo : list) {
+				if (vo.getId() != 0L) {
+					EntityWrapper<DataClassification> wrapper = new EntityWrapper<>();
+					wrapper.eq("state", 1);
+					wrapper.eq("parent_id", vo.getId());
+					List<DataClassification> selectByMap = dataClassificationService.selectList(wrapper);
+					List<DataClassificationVo> selectVoByMap = new ArrayList<>();
+					if (CollectionUtil.isNotEmpty(selectByMap)) {
+						for (DataClassification d : selectByMap) {
+							DataClassificationVo entityVo = new DataClassificationVo();
+							BeanUtils.copyProperties(d, entityVo);
+							selectVoByMap.add(entityVo);
+
+							//获取子节点
+							EntityWrapper<DataClassification> wrapperChild = new EntityWrapper<>();
+							wrapperChild.eq("state", 1);
+							wrapperChild.eq("parent_id", entityVo.getId());
+							List<DataClassification> classificationChild = dataClassificationService.selectList(wrapperChild);
+							List<DataClassificationVo> childClassifyNews = new ArrayList<>();
+							if (CollectionUtil.isNotEmpty(classificationChild)) {
+								for (DataClassification child : classificationChild) {
+									DataClassificationVo entityChild = new DataClassificationVo();
+									BeanUtils.copyProperties(child, entityChild);
+									childClassifyNews.add(entityChild);
+								}
+								entityVo.setChildClassifyNews(childClassifyNews);
+								;
 							}
-							entityVo.setChildClassifyNews(childClassifyNews);;
 						}
 					}
+					vo.setData(selectVoByMap);
 				}
-				vo.setData(selectVoByMap);
 			}
 		}
 		return list;

cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/SystemMailboxServiceImpl.java

@@ -69,19 +69,21 @@ public class SystemMailboxServiceImpl extends ServiceImpl<SystemMailboxMapper,Sy
         systemMailBoxVo.setUpdateById(res.getAccountId());
         systemMailBoxVo.setUpdateByName(res.getAccountName());
         systemMailBoxVo.setUpdateTime(new Date());
-        Long id = systemMailBoxVo.getId();
+        systemMailBox.setDeleted(DeletedEnum.NO.getValue());
+        BeanUtils.copyProperties(systemMailBoxVo,systemMailBox);
+        Long id = systemMailBox.getId();
         if(id==null||id==0L) {
             id = idGenerator.generate();
-            systemMailBoxVo.setId(id);
-            systemMailBoxVo.setSubmitTime(new Date());
-            systemMailBoxVo.setState(SiteConstant.TWO);
-            systemMailBoxVo.setCreateById(res.getAccountId());
-            systemMailBoxVo.setCreateByName(res.getAccountName());
-            systemMailBoxVo.setCreateTime(new Date());
+            systemMailBox.setId(id);
+            systemMailBox.setSubmitTime(new Date());
+            systemMailBox.setState(SiteConstant.TWO);
+            systemMailBox.setCreateById(res.getAccountId());
+            systemMailBox.setCreateByName(res.getAccountName());
+            systemMailBox.setCreateTime(new Date());
+            this.insert(systemMailBox);
+        }else{
+            this.updateById(systemMailBox);
         }
-        BeanUtils.copyProperties(systemMailBoxVo,systemMailBox);
-        systemMailBox.setDeleted(DeletedEnum.NO.getValue());
-        this.insert(systemMailBox);
         return id;
     }
 

cloud-site-service/src/main/resources/mapper/InformationMapper.xml

@@ -55,7 +55,10 @@
         <if test="null != state">
             and a.state = #{state}
         </if>
-        order by a.is_top desc, a.create_time desc
+        <if test="isTop != null">
+            and a.is_top = #{isTop}
+        </if>
+        order by a.is_top desc, a.update_time desc
     </select>
 
     <select id="informationThreeList" resultType="com.yizhi.site.application.domain.Information">
@@ -74,7 +77,10 @@
         <if test="end != null">
             and #{end} >= a.release_time
         </if>
-        order by a.is_top desc, a.create_time desc
+        <if test="isTop != null">
+            and a.is_top = #{isTop}
+        </if>
+        order by a.is_top desc, a.update_time desc
     </select>
 
     <select id="informationTwoList" resultType="com.yizhi.site.application.domain.Information">
@@ -93,7 +99,10 @@
         <if test="end != null">
             and #{end} >= a.release_time
         </if>
-        order by a.is_top desc, a.create_time desc
+        <if test="isTop != null">
+            and a.is_top = #{isTop}
+        </if>
+        order by a.is_top desc, a.update_time desc
     </select>
 
     <select id="informationAllList" resultType="com.yizhi.site.application.domain.Information">
@@ -112,7 +121,10 @@
         <if test="end != null">
             and #{end} >= a.release_time
         </if>
-        order by a.is_top desc, a.create_time desc
+        <if test="isTop != null">
+            and a.is_top = #{isTop}
+        </if>
+        order by a.is_top desc, a.update_time desc
     </select>
 
     <select id="informationPageList" resultType="com.yizhi.site.application.vo.site.InformationStudentVO">