Merge remote-tracking branch 'origin/master'

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPackagetaskController.java

@@ -90,8 +90,11 @@ public class OcrPackagetaskController extends BaseController{
 	public ResultVo<IPage<OcrPackagetask>> queryPageList(OcrPackagetask ocrPackagetask,
 													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													   @RequestParam(name="packagename", required = false) String packagename,
 													   HttpServletRequest request) {
-		
+		if(StringUtils.isBlank(packagename)){
+			return ResultVoUtil.error("请输入您需要搜索的内容");
+		}
 		//租户主键，由前端页面传送
 		String tenantId = request.getHeader("X-Tenant-Id");
 		if(StringUtils.isBlank(tenantId)){
@@ -103,6 +106,7 @@ public class OcrPackagetaskController extends BaseController{
 		
 		QueryWrapper<OcrPackagetask> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("tenant_id",tenantId);
+		queryWrapper.like("packagename",packagename);
 		Page<OcrPackagetask> page = new Page<OcrPackagetask>(pageNo, pageSize);
 		IPage<OcrPackagetask> pageList = ocrPackagetaskService.page(page, queryWrapper);
 		return ResultVoUtil.success(pageList);

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml

@@ -32,32 +32,33 @@
 
         <if test='msgCategory == "2" '>
             SELECT
-            id,
-            titile,
-            "系统管理员" as userNcame,
-            bus_json as busJson,
-            send_time as sendTime
+            m.id as id,
+            m.titile as titile,
+            "系统管理员" AS userNcame,
+            m.bus_json AS busJson,
+            r.read_flag as readFlag,
+            m.send_time AS sendTime
             FROM
-            ocr_msg
+            ocr_msg m  LEFT JOIN ocr_msg_read r ON m.id = r.msg_id
             WHERE
-            msg_category = '2'
-            AND
-            receive_user_type = '1'
-            AND FIND_IN_SET( ""#{userid}"", receive_user_ids )
+            m.msg_category = '2'
+            AND m.receive_user_type = '1'
+            AND FIND_IN_SET( ""#{userid}"", m.receive_user_ids )
 
             UNION ALL
+
             SELECT
-            id,
-            titile,
-            "系统管理员" as userNcame,
-            bus_json as busJson,
-            send_time as sendTime
+            m.id as id,
+            m.titile as titile,
+            "系统管理员" AS userNcame,
+            m.bus_json AS busJson,
+            r.read_flag as readFlag,
+            m.send_time AS sendTime
             FROM
-            ocr_msg
+            ocr_msg m  LEFT JOIN ocr_msg_read r ON m.id = r.msg_id
             WHERE
-            msg_category = '2'
-            AND
-            receive_user_type = '2'
+            m.msg_category = '2'
+            AND m.receive_user_type = '2'
         </if>
 
         <if test='msgCategory == "1" '>
@@ -66,9 +67,11 @@
             m.titile as titile,
             u.USERNAME as userName,
             m.bus_json as busJson,
+            r.read_flag as readFlag,
             m.send_time as sendTime
             FROM
             ocr_msg m LEFT JOIN s_user_t u ON m.sender=u.ID
+            LEFT JOIN ocr_msg_read r ON m.id = r.msg_id
             WHERE
             m.msg_category = '1'
             AND
@@ -81,9 +84,11 @@
             m.titile as titile,
             u.USERNAME as userName,
             m.bus_json as busJson,
+            r.read_flag as readFlag,
             m.send_time as sendTime
             FROM
             ocr_msg m LEFT JOIN s_user_t u ON m.sender=u.ID
+            LEFT JOIN ocr_msg_read r ON m.id = r.msg_id
             WHERE
             m.msg_category = '1'
             AND