修复 bug

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -263,8 +263,16 @@ public class SocialServiceImpl implements SocialServiceI {
         Map<String, Object> parameter = Maps.newHashMap();
        ResponseBean  responseBean= new ResponseBean();
         Page<TpTransaction> pageList=PageHelper.startPage(pageNum, paeSize);
-        List<TpTransaction> List= tpTransactionMapper.findAllTransaction(communityId, transactionTitle,type);
-        parameter.put("list",List);
+        List<TpTransaction> tpTransactions= tpTransactionMapper.findAllTransaction(communityId, transactionTitle,type);
+
+        tpTransactions.stream().forEach(e->{
+            // 角色
+            TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(e.getTaUserId());
+            e.setRoleId(taSysRole.getId());
+            e.setRoleName(taSysRole.getRoleName());
+        });
+
+        parameter.put("list",tpTransactions);
         parameter.put("total",pageList.getTotal());
         responseBean.addSuccess(parameter);
         return responseBean;
@@ -373,6 +381,14 @@ public class SocialServiceImpl implements SocialServiceI {
             Map<String, Object> parameter = Maps.newHashMap();
             Page<TpTransaction> pageLsit=PageHelper.startPage(pageNum, paeSize);
             List<TpTransaction> tpTransactions=tpTransactionMapper.selectTransaction(userId,communityId,type);
+
+            tpTransactions.stream().forEach(e->{
+                // 角色
+                TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(user.getId());
+                e.setRoleId(taSysRole.getId());
+                e.setRoleName(taSysRole.getRoleName());
+            });
+
             parameter.put("list",tpTransactions);
             parameter.put("total",pageLsit.getTotal());
             responseBean.addSuccess(parameter);

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java

@@ -118,7 +118,7 @@ public class TicketServiceImpl implements ITicketService {
     public void tpTicketVOConvert(List<TpTicket> source, List<TpTicketVO> target) {
 
         // 获取联系号码簿（物业号码）
-        List<TpannouncementTel> tpannouncementTel = tpannouncementTelMapper.getTpannouncementTel();
+        // List<TpannouncementTel> tpannouncementTel = tpannouncementTelMapper.getTpannouncementTel();
 
         // 查询参数
         Map<String, Object> lastRecordMap = Maps.newHashMap();
@@ -147,10 +147,15 @@ public class TicketServiceImpl implements ITicketService {
                 tpTicketVO.setCommentCreateDate(comment.getCreateDate());
             }
 
-            // 0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:被终止
-            if ("0".equals(e.getStatus())) {
-                tpTicketVO.setContactBook(tpannouncementTel);
-            }
+//            // 0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:被终止
+//
+//            // 0:待分配  需要出现物业号码簿
+//            if ("0".equals(e.getStatus())) {
+//                Map<String, Object> map = Maps.newHashMap();
+//                map.put("message","联系物业号码簿");
+//                map.put("data",tpannouncementTel);
+//                tpTicketVO.setContactBook(map);
+//            }
 
             target.add(tpTicketVO);
         });
@@ -252,7 +257,7 @@ public class TicketServiceImpl implements ITicketService {
         tpTicketRecord.setTicketId(tpTicketReco.getId());
         // 1：投诉   2：报修 3：联系物业
         String typeName = "2".equals(tpTicket.getType())?"报修":"1".equals(tpTicket.getType())?"投诉":"3".equals(tpTicket.getType())?"联系工单":"未知类型";
-        tpTicketRecord.setContent("您的"+ typeName +"正在分配物业处理人员, 若长时间无人处理, 请联系物业!");
+        tpTicketRecord.setContent("您的"+ typeName +"正在分配物业处理人员, 若长时间无人处理, 请联系物业! |联系物业号码簿 >");
         tpTicketRecord.setStatus(tpTicketReco.getStatus());
         tpTicketRecord.setCreateUser(userId);
         tpTicketRecord.setCreateDate(new Date());

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TpTicketVO.java

@@ -65,5 +65,5 @@ public class TpTicketVO {
     private Date commentCreateDate;
 
     /** 联系物业号码簿 **/
-    private List<TpannouncementTel> contactBook;
+    private Map<String,Object> contactBook;
 }

VUECODE/smart-operate-manage/src/components/Wangeditor/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="wangeditor">
-    <div ref="editorElem" style="text-align:left"/>
+    <div ref="editorElem" style="text-align:left" />
   </div>
 </template>
 

VUECODE/smart-operate-manage/src/permission.js

@@ -8,6 +8,7 @@ import { getToken } from '@/utils/auth' // 验权
 const whiteList = ['/login'] // 不重定向白名单
 router.beforeEach((to, from, next) => {
   NProgress.start()
+  console.log("路径: ", to.path)
   if (getToken()) {
     if (to.path === '/login') {
       next({ path: '/' })
@@ -27,6 +28,10 @@ router.beforeEach((to, from, next) => {
       }
     }
   } else {
+    // if (to.path === '/') {
+    //   next(`/login?redirect=${to.path}`)
+    //   NProgress.done()
+    // }
     if (whiteList.indexOf(to.path) !== -1) {
       next()
     } else {