Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/oa/controller/NewsController.java

@@ -41,7 +41,9 @@ import com.xjrsoft.module.oa.vo.NewsRelationConfigVo;
 import com.xjrsoft.module.oa.vo.NewsRelationVo;
 import com.xjrsoft.module.oa.vo.NewsVo;
 import com.xjrsoft.module.organization.entity.Department;
+import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.organization.mapper.DepartmentMapper;
+import com.xjrsoft.module.organization.service.IUserService;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.entity.SystemUpdateMessage;
 import com.xjrsoft.module.system.entity.SystemUpdateMessageNotice;
@@ -84,6 +86,7 @@ public class NewsController {
     private INewsAppendixService newsAppendixService;
     private DepartmentMapper departmentMapper;
     private INewsRelationConfigService newsRelationConfigService;
+    private final IUserService userService;
 
     @GetMapping
     @ApiOperation(value = "获取新闻分页")
@@ -168,6 +171,9 @@ public class NewsController {
         NewsVo newsVo = BeanUtil.toBean(news, NewsVo.class);
         newsVo.setRelationList(newsRelationVoList);
 
+        User user = userService.getById(news.getCreateUserId());
+        newsVo.setCreateUserName(user.getName());
+
         Department department = departmentMapper.selectById(newsVo.getSendDeptId());
         if (department != null) {
             newsVo.setSendDeptIdCN(department.getName());

src/main/java/com/xjrsoft/module/oa/vo/NewsVo.java

@@ -144,4 +144,10 @@ public class NewsVo {
     @EntityMapping(thisField = "id", joinField = "newsId")
     private List<NewsRelationVo> relationList;
 
+    @ApiModelProperty("办事指南显示范围")
+    private String guideShowRange;
+
+    @ApiModelProperty("创建人名字")
+    private String createUserName;
+
 }

src/main/resources/mapper/oa/OfficialDocumentReceivedHandleMapper.xml

@@ -9,10 +9,11 @@
         REPLACE((
         SELECT GROUP_CONCAT(c2.name) FROM official_document_received_handle c1
         INNER JOIN xjr_user c2 ON c1.receive_user_id = c2.id
-        WHERE c1.delete_mark = 0 AND c1.official_document_received_id = t1.id and c1.is_transfer = 1
-        ),',', '>') AS receive_user_names,t1.is_handle,t4.name as handle_user_name,t1.handle_time,
+        WHERE c1.delete_mark = 0 AND c1.official_document_received_id = t1.id AND c1.is_transfer = 1
+        ORDER BY c1.create_date
+        ),',', '>') AS receive_user_names,t1.is_handle,t4.name AS handle_user_name,t1.handle_time,
         IFNULL((
-        SELECT is_transfer FROM official_document_received_handle WHERE official_document_received_id = t1.id
+        SELECT COUNT(*) > 0 FROM official_document_received_handle WHERE official_document_received_id = t1.id
         AND create_user_id = #{dto.loginUserId}
         ), 0) AS is_transfer
         FROM official_document_received t1