Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/surface/components/RightPreview.vue

@@ -23,6 +23,9 @@
             :key="v.id"
           >
             <img :src="v.previewImagePath" />
+            <div class="name">
+              {{ v.name }}
+            </div>
           </div>
         </div>
         <a-empty v-else :image="simpleImage" />
@@ -180,12 +183,25 @@ export default {
       margin-bottom: 6px;
       height: 120px;
       background-color: #ececec;
+      position: relative;
       cursor: pointer;
       img {
         width: 100%;
         height: 100%;
         object-fit: contain;
       }
+      .name {
+        width: 100%;
+        background-color: rgba(0, 0, 0, 0.3);
+        color: #fff;
+        position: absolute;
+        left: 0px;
+        bottom: 0px;
+        text-align: center;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
     }
     .active {
       border: 4px solid #ff8522;

base-manager/src/main/java/com/mortals/xhx/module/window/model/vo/WindowVo.java

 package com.mortals.xhx.module.window.model.vo;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.window.model.WindowBusinessEntity;
-import com.mortals.xhx.module.window.model.WindowEntity;
 import com.mortals.xhx.module.window.model.WindowMatterEntity;
 import com.mortals.xhx.module.workman.model.WorkmanEntity;
 import lombok.Data;
 
-import java.util.ArrayList;
 import java.util.List;
 /**
 * 站点部门窗口视图对象
@@ -33,4 +31,7 @@ public class WindowVo extends BaseEntityLong {
      */
     private String hallName;
 
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
 }
\ No newline at end of file

portal-manager-ui/admin/src/views/signIn/signIn.vue

@@ -49,7 +49,7 @@
                       v-model="form.password"
                       @pressEnter="handleSubmit"
                     >
-                      <img slot="prefix" src="@/assets/images/icon-user.png" />
+                      <img slot="prefix" src="@/assets/images/icon-pwd.png" />
                       <template slot="suffix">
                         <a-space>
                           <img
@@ -142,7 +142,7 @@
                       v-model="changePwdForm.oldPwd"
                       @pressEnter="changePwd"
                     >
-                      <img slot="prefix" src="@/assets/images/icon-user.png" />
+                      <img slot="prefix" src="@/assets/images/icon-pwd.png" />
                       <template slot="suffix">
                         <a-space>
                           <img
@@ -172,7 +172,7 @@
                       v-model="changePwdForm.newPwd"
                       @pressEnter="changePwd"
                     >
-                      <img slot="prefix" src="@/assets/images/icon-user.png" />
+                      <img slot="prefix" src="@/assets/images/icon-pwd.png" />
                       <template slot="suffix">
                         <a-space>
                           <img
@@ -202,7 +202,7 @@
                       v-model="changePwdForm.newPwdAgain"
                       @pressEnter="changePwd"
                     >
-                      <img slot="prefix" src="@/assets/images/icon-user.png" />
+                      <img slot="prefix" src="@/assets/images/icon-pwd.png" />
                       <template slot="suffix">
                         <a-space>
                           <img

portal-manager/src/main/java/com/mortals/xhx/module/role/service/impl/RoleAuthServiceImpl.java

@@ -103,7 +103,7 @@ public class RoleAuthServiceImpl extends AbstractCRUDServiceImpl<RoleAuthDao, Ro
         condition.setRoleId(roleId);
         List<RoleAuthEntity> roleModelEntities = this.find(condition);
         if (CollectionUtils.isNotEmpty(roleModelEntities)) {
-            List<Long> menuIds = roleModelEntities.stream().map(RoleAuthEntity::getMenuId).collect(Collectors.toList());
+            List<Long> menuIds = roleModelEntities.stream().filter(m->m.getMenuId()!=null).map(RoleAuthEntity::getMenuId).collect(Collectors.toList());
             MenuQuery query1 = new MenuQuery();
             query1.setIdList(menuIds);
             List<MenuEntity> menuEntities = menuService.find(query1);

portal-manager/src/main/java/com/mortals/xhx/module/role/service/impl/RoleServiceImpl.java

@@ -44,7 +44,7 @@ public class RoleServiceImpl extends AbstractCRUDServiceImpl<RoleDao, RoleEntity
     @Override
     protected void findAfter(RoleEntity entity, Context context, List<RoleEntity> list) throws AppException {
         list.stream().forEach(item->{
-            List<Long> menuIds = roleAuthService.find(new RoleAuthQuery().roleId(item.getId())).stream().map(m -> m.getMenuId()).collect(Collectors.toList());
+            List<Long> menuIds = roleAuthService.find(new RoleAuthQuery().roleId(item.getId())).stream().filter(m->m.getMenuId()!=null).map(m -> m.getMenuId()).collect(Collectors.toList());
             if(!ObjectUtils.isEmpty(menuIds)){
                 item.setMenuIdList(menuIds);
             }