Merge remote-tracking branch 'origin/master'

pom.xml

@@ -196,22 +196,6 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
-            <!-- Oracle JDBC Driver -->
-            <!--<dependency>
-                <groupId>com.oracle.database.jdbc</groupId>
-                <artifactId>ojdbc6</artifactId>
-                <version>11.2.0.1.0</version>
-            </dependency>-->
-
-            <!-- 添加对本地jar包的依赖 -->
-            <!--<dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-zzb</artifactId>
-                <version>1.0.0</version>
-                <scope>system</scope>
-                <systemPath>${project.basedir}/ruoyi-zzb/lib/ojdbc6.jar</systemPath>
-            </dependency>-->
-
 
         </dependencies>
     </dependencyManagement>

ruoyi-zzb/src/main/java/com/ruoyi/zzb/common/RspResult.java

@@ -91,4 +91,6 @@ public class RspResult {
         return (JSONObject) JSON.toJSON(new RspResult(StateCodeEnum.ERROR.getCode(), StateCodeEnum.ERROR.getMsg(), data));
     }
 
+
+
 }

ruoyi-zzb/src/main/java/com/ruoyi/zzb/common/StateCodeEnum.java

@@ -5,8 +5,8 @@ package com.ruoyi.zzb.common;
  */
 public enum StateCodeEnum {
 
-    SUCCESS(200, "响应成功"),
-    ERROR(500, "响应失败");
+    SUCCESS(200, "操作成功"),
+    ERROR(500, "操作失败");
 
     private int code;
     private String msg;

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/config/AutoPaginationInnerInterceptor.java

@@ -0,0 +1,25 @@
+package com.ruoyi.zzb.zdcx.config;
+
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.pagination.DialectFactory;
+import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.IDialect;
+import com.baomidou.mybatisplus.extension.toolkit.JdbcUtils;
+import org.apache.ibatis.executor.Executor;
+
+/**
+ * 配置动态数据库方言
+ */
+public class AutoPaginationInnerInterceptor extends PaginationInnerInterceptor {
+
+    @Override
+    protected IDialect findIDialect(Executor executor) {
+        // 首先尝试获取已经设置的方言
+        IDialect dialect = super.findIDialect(executor);
+        // 如果方言未设置，则根据数据库连接类型动态获取
+        if (dialect == null) {
+            return DialectFactory.getDialect(JdbcUtils.getDbType(executor));
+        }
+        return dialect;
+    }
+
+}

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/config/MyBatisPlusConfig.java

@@ -0,0 +1,29 @@
+package com.ruoyi.zzb.zdcx.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.ruoyi.common.utils.PageUtils;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * MyBatisPlus配置类
+ */
+//@Configuration
+//@EnableTransactionManagement
+public class MyBatisPlusConfig {
+    @Bean(value = "MybatisPlusInterceptor_oracle")
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        // 分页插件
+//        PaginationInnerInterceptor pi = new PaginationInnerInterceptor(DbType.ORACLE);
+        // 设置最大查询数量，防止一次查询太多数据，给数据库压力过大
+//        pi.setMaxLimit(1000L);
+        // 添加分页插件
+        interceptor.addInnerInterceptor(new AutoPaginationInnerInterceptor());
+        return interceptor;
+    }
+
+}

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/controller/ZdcxController.java

@@ -1,36 +1,66 @@
 package com.ruoyi.zzb.zdcx.controller;
 
-
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.zzb.common.RspResult;
+import com.ruoyi.zzb.study.domain.BasePersonInfo;
 import com.ruoyi.zzb.zdcx.domain.Zdcx;
 import com.ruoyi.zzb.zdcx.service.ZdcxService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-import java.util.List;
+import org.springframework.web.bind.annotation.*;
 
+@Slf4j
 @RestController
-@RequestMapping("/zdcx")
+@RequestMapping("/zhzg/api/zdcx")
 public class ZdcxController {
 
     @Autowired
     private ZdcxService zdcxService;
 
+    /**
+     * 根据条件分页查询一/多条制度信息
+     * @param zdcx
+     * @return
+     */
     @PostMapping("/query")
     public JSONObject query(@RequestBody Zdcx zdcx){
+        if(null == zdcx.getQueryFlag()){
+            log.error("查询标志参数为空");
+            return RspResult.error("查询标志参数为空");
+        }
+        if(null == zdcx.getPageNo() || null == zdcx.getPageSize()){
+            log.error("分页查询参数非法");
+            return RspResult.error("分页查询参数非法");
+        }
         try {
-            List<Zdcx> data = zdcxService.getByParams(zdcx);
-            return RspResult.success(data);
+            return RspResult.success(zdcxService.getDataByPage(zdcx));
         }catch (Exception e){
+            log.error("根据条件分页查询制度信息发生异常", e);
             return RspResult.error(e.getMessage());
         }
     }
 
+    /**
+     * 保存一条制度信息
+     * @param reqBody
+     * @return
+     */
+    @PostMapping("/save")
+    public JSONObject save(@RequestBody JSONObject reqBody){
+        String policeNo = reqBody.getString("policeNo");
+        if(StringUtils.isBlank(policeNo)){
+            log.error("用户警号参数为空");
+            return RspResult.error("用户警号参数为空");
+        }
+        // 根据警号查询当前登录用户信息，警号为前端传入
+        BasePersonInfo basePersonInfo = zdcxService.getDataByParams(policeNo);
+        boolean flag = zdcxService.insertStandardInfo(reqBody, basePersonInfo);
+        if(flag){
+            return RspResult.success();
+        }
+        return RspResult.error("制度规范信息保存失败");
+    }
 
 
 }

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/domain/Zdcx.java

@@ -4,18 +4,25 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
 /**
  * 【制度查询】实体类
  */
+@Data
+@NoArgsConstructor
 @TableName("STANDARD_DOC_INFO")
 public class Zdcx {
 
-    @TableId(type = IdType.AUTO, value = "ID")
+    @TableId(type = IdType.INPUT, value = "ID")
     @TableField("ID")
-    private Integer id;
+    private String id;
     // 文号
     @TableField("DOC_ID")
     private String docId;
@@ -23,14 +30,18 @@ public class Zdcx {
     @TableField("TITLE")
     private String title;
     // 制定单位
-    @TableField("ZHIDING_DEPT")
-    private String zhidingDept;
+    @TableField("PUBLISH_DEPT")
+    private String publishDept;
     // 内容
     @TableField("CONTENT")
     private String content;
+
     // 发布时间
     @TableField("CREATE_TIME")
-    private Date createTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String createTime;
+
     @TableField("CREATE_USER_ID")
     private String createUserId;
     @TableField("CREATE_USER_NAME")
@@ -47,118 +58,13 @@ public class Zdcx {
     private String createDeptCode;
     // 是否删除
     @TableField("IS_DELETE")
-    private int isDelete;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getDocId() {
-        return docId;
-    }
-
-    public void setDocId(String docId) {
-        this.docId = docId;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getZhidingDept() {
-        return zhidingDept;
-    }
-
-    public void setZhidingDept(String zhidingDept) {
-        this.zhidingDept = zhidingDept;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getCreateUserId() {
-        return createUserId;
-    }
-
-    public void setCreateUserId(String createUserId) {
-        this.createUserId = createUserId;
-    }
-
-    public String getCreateUserName() {
-        return createUserName;
-    }
-
-    public void setCreateUserName(String createUserName) {
-        this.createUserName = createUserName;
-    }
-
-    public String getCreateUserPoliceNo() {
-        return createUserPoliceNo;
-    }
-
-    public void setCreateUserPoliceNo(String createUserPoliceNo) {
-        this.createUserPoliceNo = createUserPoliceNo;
-    }
-
-    public String getCreateParentDeptName() {
-        return createParentDeptName;
-    }
-
-    public void setCreateParentDeptName(String createParentDeptName) {
-        this.createParentDeptName = createParentDeptName;
-    }
-
-    public String getCreateParentDeptCode() {
-        return createParentDeptCode;
-    }
-
-    public void setCreateParentDeptCode(String createParentDeptCode) {
-        this.createParentDeptCode = createParentDeptCode;
-    }
-
-    public String getCreateDeptName() {
-        return createDeptName;
-    }
-
-    public void setCreateDeptName(String createDeptName) {
-        this.createDeptName = createDeptName;
-    }
-
-    public String getCreateDeptCode() {
-        return createDeptCode;
-    }
-
-    public void setCreateDeptCode(String createDeptCode) {
-        this.createDeptCode = createDeptCode;
-    }
+    private Integer isDelete;
+    @TableField("FLAG")
+    private Integer flag;
 
-    public int getIsDelete() {
-        return isDelete;
-    }
+    private Integer pageNo;
+    private Integer pageSize;
+    private Integer queryFlag;
 
-    public void setIsDelete(int isDelete) {
-        this.isDelete = isDelete;
-    }
 
 }

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/dto/QueryParamsDTO.java

@@ -0,0 +1,42 @@
+package com.ruoyi.zzb.zdcx.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class QueryParamsDTO {
+
+    private String id;
+    // 文号
+    private String docId;
+    // 题目
+    private String title;
+    // 制定单位
+    private String publishDept;
+    // 内容
+    private String content;
+    // 发布时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String createTime;
+    private String createUserId;
+    private String createUserName;
+    private String createUserPoliceNo;
+    private String createParentDeptName;
+    private String createParentDeptCode;
+    private String createDeptName;
+    private String createDeptCode;
+    // 是否删除
+    private Integer isDelete;
+    private Integer flag;
+    private Integer pageNo;
+    private Integer pageSize;
+    private Integer queryFlag;
+    private String policeNo;
+}

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/mapper/ZdcxMapper.java

@@ -1,9 +1,29 @@
 package com.ruoyi.zzb.zdcx.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.zzb.zdcx.domain.Zdcx;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import java.util.List;
+import java.util.Map;
 
 @Mapper
+@DataSource(value = DataSourceType.SLAVE)
 public interface ZdcxMapper extends BaseMapper<Zdcx> {
+
+//    @Select("select * from ( select row_.*, rownum rownum_ from ( select * from STANDARD_DOC_INFO ) row_ where rownum <= #{pageNo} * #{pageSize} ) a where rownum_ > ( #{pageNo} - 1) * #{pageSize}")
+//    List<Zdcx> getDataByPage(@Param("pageNo") Integer pageNo, @Param("pageSize") Integer PageSize);
+
+    /**按照条件查询制度信息*/
+//    List<Zdcx> getDataByPage(Zdcx zdcx);
+
+    /**按照参数查询制度信息总数据条数*/
+//    Long getDataCount(Zdcx zdcx);
+
+
+
+
 }

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/service/ZdcxService.java

@@ -1,49 +1,132 @@
 package com.ruoyi.zzb.zdcx.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.zzb.study.domain.BasePersonInfo;
+import com.ruoyi.zzb.study.mapper.BasePersonInfoMapper;
 import com.ruoyi.zzb.zdcx.domain.Zdcx;
 import com.ruoyi.zzb.zdcx.mapper.ZdcxMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.web.format.DateTimeFormatters;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
+@Slf4j
 @Service
 @DataSource(value = DataSourceType.SLAVE)
 public class ZdcxService {
 
     @Autowired
     private ZdcxMapper zdcxMapper;
+    @Autowired
+    private BasePersonInfoMapper basePersonInfoMapper;
 
-    public List<Zdcx> getByParams(Zdcx zdcx){
+    /**
+     * 根据条件分页查询制度信息
+     * @param zdcx
+     * @return
+     */
+    public Map<String, Object> getDataByPage(Zdcx zdcx){
+        Map<String, Object> rspMap = new HashMap<>();
         String docId = zdcx.getDocId();
         String title = zdcx.getTitle();
-        String zhidingDept = zdcx.getZhidingDept();
-        Date createTime = zdcx.getCreateTime();
+        String publishDept = zdcx.getPublishDept();
+        String createTime = zdcx.getCreateTime();
         String content = zdcx.getContent();
+        // 查询标志位  0：and，1：or
+        Integer queryFlag = zdcx.getQueryFlag();
+        Integer pageNo = zdcx.getPageNo();
+        Integer pageSize = zdcx.getPageSize();
 
         QueryWrapper<Zdcx> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("FLAG", 1);
         if(StringUtils.isNotBlank(docId)){
+            if (queryFlag != 0){              // or
+                queryWrapper.or();
+            }
             queryWrapper.eq("DOC_ID", docId);
         }
         if(StringUtils.isNotBlank(title)){
+            if (queryFlag != 0){
+                queryWrapper.or();
+            }
             queryWrapper.eq("TITLE", title);
         }
-        if(StringUtils.isNotBlank(zhidingDept)){
-            queryWrapper.eq("ZHIDINGDEPT", zhidingDept);
+        if(StringUtils.isNotBlank(publishDept)){
+            if (queryFlag != 0){
+                queryWrapper.or();
+            }
+            queryWrapper.eq("PUBLISH_DEPT", publishDept);
         }
-//        if(null != createTime){
-//            queryWrapper.eq("CREATETIME", createTime);
-//        }
         if(StringUtils.isNotBlank(content)){
+            if (queryFlag != 0){
+                queryWrapper.or();
+            }
             queryWrapper.like("CONTENT", content);
         }
-        List<Zdcx> dataList = zdcxMapper.selectList(queryWrapper);
-        return dataList;
+        Page<Zdcx> page = new Page<>(pageNo, pageSize);
+        IPage<Zdcx> zdcxPage = zdcxMapper.selectPage(page, queryWrapper);
+        rspMap.put("list", zdcxPage.getRecords());
+        rspMap.put("count", zdcxPage.getTotal());
+
+        /*List<Zdcx> dataList = zdcxMapper.getDataByPage(zdcx);
+        Long count = zdcxMapper.getDataCount(zdcx);
+        rspMap.put("list", dataList);
+        rspMap.put("count", count);*/
+        return rspMap;
+    }
+
+    /**
+     * 根据警号查询当前用户信息
+     * @param policeNo
+     * @return
+     */
+    public BasePersonInfo getDataByParams(String policeNo){
+        QueryWrapper<BasePersonInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("POLICE_NO", policeNo);
+        return basePersonInfoMapper.selectOne(queryWrapper);
+    }
+
+    /**
+     * 根据参数保存一条制度规范信息
+     * @param reqBody
+     * @param basePersonInfo
+     * @return
+     */
+    public boolean insertStandardInfo(JSONObject reqBody, BasePersonInfo basePersonInfo){
+        Zdcx zdcx = new Zdcx();
+        // 制度信息
+        zdcx.setId(UUID.randomUUID().toString().replace("-", ""));
+        zdcx.setDocId(reqBody.getString("docId"));
+        zdcx.setTitle(reqBody.getString("title"));
+        zdcx.setPublishDept(reqBody.getString("publishDept"));
+        zdcx.setContent(reqBody.getString("content"));
+        zdcx.setIsDelete(0);
+        zdcx.setFlag(1);
+        // 录入人信息
+        zdcx.setCreateUserId(basePersonInfo.getUserId());
+        zdcx.setCreateUserName(basePersonInfo.getName());
+        zdcx.setCreateUserPoliceNo(basePersonInfo.getPoliceNo());
+        zdcx.setCreateDeptName(basePersonInfo.getDeptName());
+        zdcx.setCreateDeptCode(basePersonInfo.getDeptCode());
+        zdcx.setCreateParentDeptName(basePersonInfo.getParentDeptName());
+        zdcx.setCreateParentDeptCode(basePersonInfo.getParentDeptCode());
+        try {
+            if (zdcxMapper.insert(zdcx) > 0) {
+                log.info("制度规范信息保存成功");
+                return true;
+            }
+        }catch (Exception e){
+            log.error("制度规范信息保存时发生异常", e);
+            return false;
+        }
+        return false;
     }
+
 }

ruoyi-zzb/src/main/resources/mapper/ZdcxMapper.xml

@@ -4,15 +4,85 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.zzb.zdcx.mapper.ZdcxMapper">
 
-	<!--<resultMap type="User" id="UserResult">
-	    <id property="id" column="id" />
-		<result property="username" column="username" />
-		<result property="password" column="password" />
-	</resultMap>-->
+	<!--<resultMap id="ZdcxResultMap" type="Zdcx" >
+		<id property="id" jdbcType="VARCHAR" column="id"/>
+		<result property="docId" jdbcType="VARCHAR" column="DOC_ID"/>
+		<result property="title" jdbcType="VARCHAR" column="TITLE"/>
+		<result property="content" jdbcType="VARCHAR" column="CONTENT"/>
+		<result property="publishDept" jdbcType="VARCHAR" column="PUBLISH_DEPT"/>
+		<result property="createTime" jdbcType="VARCHAR" column="CREATE_TIME"/>
+		<result property="createDeptCode" jdbcType="VARCHAR" column="CREATE_DEPT_CODE"/>
+		<result property="createDeptName" jdbcType="VARCHAR" column="CREATE_DEPT_NAME"/>
+		<result property="createParentDeptName" jdbcType="VARCHAR" column="CREATE_PARENT_DEPT_NAME"/>
+		<result property="createParentDeptCode" jdbcType="VARCHAR" column="CREATE_PARENT_DEPT_CODE"/>
+		<result property="createUserId" jdbcType="VARCHAR" column="CREATE_USER_ID"/>
+		<result property="createUserName" jdbcType="VARCHAR" column="CREATE_USER_NAME"/>
+		<result property="createUserPoliceNo" jdbcType="VARCHAR" column="CREATE_USER_POLICE_NO"/>
+		<result property="isDelete" jdbcType="INTEGER" column="IS_DELETE"/>
+		<result property="flag" jdbcType="INTEGER" column="FLAG"/>
+	</resultMap>
 
-	<!--<sql id="selectById">
-		select * from t_user
-	</sql>-->
-	
+	<select id="getDataByPage" parameterType="Zdcx" resultMap="ZdcxResultMap">
+		select * from (select t.*, rownum rownum_ from (select DOC_ID, TITLE, PUBLISH_DEPT, CONTENT, CREATE_TIME from 'STANDARD_DOC_INFO'
+		<where>
+		    1 = 1
+			<if test="queryFlag == 0 and docId != null">
+				and docId = #{docId}
+			</if>
+			<if test="queryFlag == 1 and docId != null">
+				or docId = #{docId}
+			</if>
+			<if test="queryFlag == 0 and title != null">
+				and title = #{title}
+			</if>
+			<if test="queryFlag == 1 and title != null">
+				or title = #{title}
+			</if>
+			<if test="queryFlag == 0 and publishDept != null">
+				and publishDept = #{publishDept}
+			</if>
+			<if test="queryFlag == 1 and publishDept != null">
+				or publishDept = #{publishDept}
+			</if>
+			<if test="queryFlag == 0 and content != null">
+				and content like #{content}
+			</if>
+			<if test="queryFlag == 1 and content != null">
+				or content like #{content}
+			</if>
+		</where>
+		) t where rownum <= #{pageNo} * #{pageSize}) a where rownum_ > ( #{pageNo} - 1) * #{pageSize}
+	</select>
+
+	<select id="getDataCount" parameterType="Map" resultType="Long">
+		select count(*) from 'STANDARD_DOC_INFO'
+		<where>
+			1 = 1
+			<if test="queryFlag == 0 and docId != null">
+				and docId = #{docId}
+			</if>
+			<if test="queryFlag == 1 and docId != null">
+				or docId = #{docId}
+			</if>
+			<if test="queryFlag == 0 and title != null">
+				and title = #{title}
+			</if>
+			<if test="queryFlag == 1 and title != null">
+				or title = #{title}
+			</if>
+			<if test="queryFlag == 0 and publishDept != null">
+				and publishDept = #{publishDept}
+			</if>
+			<if test="queryFlag == 1 and publishDept != null">
+				or publishDept = #{publishDept}
+			</if>
+			<if test="queryFlag == 0 and content != null">
+				and content like #{content}
+			</if>
+			<if test="queryFlag == 1 and content != null">
+				or content like #{content}
+			</if>
+		</where>
+	</select>-->
 
 </mapper>