Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java

@@ -203,7 +203,7 @@ public class ExhibitionBoardController extends BaseController {
     public Map<String, Object> getExhibitionBoardList(
             @RequestParam(value = "exhibitionBoardCatIdList", required = false) List<String> exhibitionBoardCatIdList,
             @RequestParam(value = "boardCopyrightOwnerIdList", required = false) List<String> boardCopyrightOwnerIdList) {
-        final LambdaQueryWrapper<ExhibitionBoard> lambdaQueryWrapper = Wrappers.<ExhibitionBoard>lambdaQuery().eq(ExhibitionBoard::getAuditStatus, "APPROVED_FINAL").eq(ExhibitionBoard::getPublished, true);
+        final LambdaQueryWrapper<ExhibitionBoard> lambdaQueryWrapper = Wrappers.<ExhibitionBoard>lambdaQuery().eq(ExhibitionBoard::getPublished, true);
         if (exhibitionBoardCatIdList != null && !exhibitionBoardCatIdList.isEmpty()) {
             lambdaQueryWrapper.in(ExhibitionBoard::getExhibitionBoardCatId, exhibitionBoardCatIdList);
         }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java

@@ -56,6 +56,9 @@ public class TOrganController extends BaseController {
     public Map<String, Object> add(TOrgan organ) {
         HashMap<String, Object> resultMap = new HashMap<>();
         QueryWrapper<TOrgan> ew = new QueryWrapper<>();
+        if (StringUtils.isBlank(organ.getParentId())){
+            organ.setParentId("0");
+        }
         if (StringUtils.isNoneBlank(organ.getName().trim())) {
             organ.setName(organ.getName().trim());
             ew.eq("is_deleted", 0);