Merge remote-tracking branch 'origin/master'

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

@@ -142,7 +142,9 @@ export default {
   methods: {
     // 获取用户常用站点列表
     async getCollect() {
-      let res = await getCollect();
+      let res = await getCollect({
+        siteId: this.siteId,
+      });
       if (res.code == 1) {
         this.collectList = res.data;
       }
@@ -196,6 +198,7 @@ export default {
     async saveCollect() {
       let modelIds = this.collectList.map((v) => v.id).join(",");
       let res = await saveCollect({
+        siteId: this.siteId,
         modelIds,
       });
       // if (res.data.code == 1) {

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/EditUser.vue

@@ -46,10 +46,10 @@
         <a-form-model-item label="用户角色" prop="roleId">
           <a-select v-model="form.roleId" placeholder="请选择角色">
             <a-select-option
-              v-for="v in userDict"
-              :key="v.key"
-              :value="v.key"
-              >{{ v.value }}</a-select-option
+              v-for="(v, key) in userDict"
+              :key="key"
+              :value="key"
+              >{{ v }}</a-select-option
             >
           </a-select>
         </a-form-model-item>
@@ -105,9 +105,9 @@ export default {
   },
   props: {
     userDict: {
-      type: Array,
+      type: Object,
       default: () => {
-        return [];
+        return {};
       },
     },
     visibleUserEdit: {
@@ -153,12 +153,22 @@ export default {
     // 编辑
     onEdit(row) {
       this.form = { ...row };
-      this.form.areaNames = JSON.parse(this.form.areaNames);
-      if (this.form.areaNames.length) {
-        this.selectAreaList = this.form.areaNames.map((v) => v.label);
+      try {
+        this.form.areaNames = JSON.parse(this.form.areaNames);
+      } catch (err) {
+        this.form.areaNames = this.form.areaNames;
+        console.log(typeof this.form.areaNames);
+      }
+      if (typeof this.form.areaNames == "string") {
+        this.selectAreaList = [this.form.areaNames];
       } else {
-        this.selectAreaList = [];
+        if (this.form.areaNames.length) {
+          this.selectAreaList = this.form.areaNames.map((v) => v.label);
+        } else {
+          this.selectAreaList = [];
+        }
       }
+
       // this.form.areaCodes = this.form.areaCodes.split(",");
       this.form.loginPwd && this.$delete(this.form, "loginPwd");
     },
@@ -216,5 +226,4 @@ export default {
 };
 </script>
 
-<style>
-</style>
\ No newline at end of file
+<style></style>

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/addUser.vue

@@ -70,10 +70,10 @@
         <a-form-model-item label="用户角色" prop="roleId">
           <a-select v-model="form.roleId" placeholder="请选择角色">
             <a-select-option
-              v-for="v in userDict"
-              :key="v.key"
-              :value="v.key"
-              >{{ v.value }}</a-select-option
+              v-for="(v, key) in userDict"
+              :key="key"
+              :value="key"
+              >{{ v }}</a-select-option
             >
           </a-select>
         </a-form-model-item>
@@ -135,9 +135,9 @@ export default {
   },
   props: {
     userDict: {
-      type: Array,
+      type: Object,
       default: () => {
-        return [];
+        return {};
       },
     },
     visibleUser: {
@@ -229,5 +229,4 @@ export default {
 };
 </script>
 
-<style>
-</style>
\ No newline at end of file
+<style></style>

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/userManagement.vue

@@ -170,7 +170,7 @@ export default {
       },
       formTitle: undefined, //表单title
       sourceInfoForm: {},
-      userDict: [], // 角色数据
+      userDict: {}, // 角色数据
       userform: {
         roleId: undefined,
         searchVal: undefined,

portal-manager/db/add.sql

@@ -53,4 +53,12 @@ CREATE TABLE `mortals_xhx_user_model_collect` (
   `modelIds` varchar(128) DEFAULT NULL COMMENT '收藏模块',
   `createTime` datetime DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户模块收藏';
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户模块收藏';
+
+-- ----------------------------
+2023-10-10
+-- ----------------------------
+ALTER TABLE `mortals_xhx_user_model_collect`
+ADD COLUMN `siteId` bigint(20) DEFAULT NULL COMMENT '站点ID';
+
+UPDATE mortals_xhx_user_model_collect SET siteId=1;
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/user/model/UserModelCollectEntity.java

 package com.mortals.xhx.module.user.model;
-import java.util.List;
-import java.util.ArrayList;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mortals.framework.annotation.Excel;
-import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.user.model.vo.UserModelCollectVo;
 import lombok.Data;
 /**
-* 用户模块收藏实体对象
-*
-* @author zxfei
-* @date 2023-08-29
-*/
+ * 用户模块收藏实体对象
+ *
+ * @author zxfei
+ * @date 2023-10-10
+ */
 @Data
 public class UserModelCollectEntity extends UserModelCollectVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 用户ID，主键，自增长
-    */
+     * 用户ID，主键，自增长
+     */
     private Long userId;
     /**
-    * 登录名
-    */
+     * 登录名
+     */
     private String realName;
     /**
-    * 收藏模块
-    */
+     * 收藏模块
+     */
     private String modelIds;
+    /**
+     * 站点id
+     */
+    private Long siteId;
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -38,18 +37,16 @@ public class UserModelCollectEntity extends UserModelCollectVo {
         if (obj instanceof UserModelCollectEntity) {
             UserModelCollectEntity tmp = (UserModelCollectEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
     }
 
     public void initAttrValue(){
-
-            this.userId = -1L;
-
-            this.realName = "";
-
-            this.modelIds = "";
+        this.userId = null;
+        this.realName = "";
+        this.modelIds = "";
+        this.siteId = null;
     }
 }
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserModelCollectController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.RepeatSubmit;
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.IUser;
@@ -54,20 +55,27 @@ public class UserModelCollectController extends BaseCRUDJsonBodyMappingControlle
 
 
     @PostMapping({"get"})
-    public String getCollect() {
+    @UnAuth
+    public String getCollect(@RequestBody UserModelCollectEntity query) {
+
         Map<String, Object> model = new HashMap();
         JSONObject ret = new JSONObject();
         String busiDesc = "查看" + this.getModuleDesc();
         Context context = this.getContext();
         model.put("data", Collections.emptyList());
         try {
-            UserModelCollectEntity  query = new UserModelCollectEntity();
-            query.setUserId(this.getCurUser().getId());
-            UserModelCollectEntity entity = this.service.selectOne(query);
+            if(query.getSiteId()==null){
+                throw new AppException("站点ID不能为空");
+            }
+            UserModelCollectEntity  temp = new UserModelCollectEntity();
+            temp.setUserId(this.getCurUser().getId());
+            temp.setSiteId(query.getSiteId());
+            UserModelCollectEntity entity = this.service.selectOne(temp);
             if (entity == null) {
                 entity = new UserModelCollectEntity();
                 entity.setUserId(this.getCurUser().getId());
                 entity.setRealName(this.getCurUser().getRealName());
+                entity.setSiteId(query.getSiteId());
                 entity.setModelIds("");
             }else {
                 if(StringUtils.isNotEmpty(entity.getModelIds())){
@@ -117,6 +125,7 @@ public class UserModelCollectController extends BaseCRUDJsonBodyMappingControlle
     @Override
     @PostMapping({"save"})
     @RepeatSubmit
+    @UnAuth
     public String save(@RequestBody UserModelCollectEntity entity) {
         Map<String, Object> model = new HashMap();
         Context context = this.getContext();
@@ -126,8 +135,12 @@ public class UserModelCollectController extends BaseCRUDJsonBodyMappingControlle
             return this.createFailJsonResp("请选择要收藏的模块");
         }
         try {
+            if(entity.getSiteId()==null){
+                throw new AppException("站点ID不能为空");
+            }
             UserModelCollectEntity  query = new UserModelCollectEntity();
             query.setUserId(this.getCurUser().getId());
+            query.setSiteId(query.getSiteId());
             UserModelCollectEntity temp = this.service.selectOne(query);
             if (temp == null) {
                 Class<UserModelCollectEntity> tClass = ReflectUtils.getClassGenricType(this.getClass(), 1);