Merge remote-tracking branch 'origin/master'

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

@@ -188,6 +188,10 @@ export default {
         } else {
           this.censusList = [];
           this.active = "CensusType_1";
+          if (this.$route.path != "/home/dataManagement") {
+            console.log(1);
+            this.$router.push("/home/dataManagement");
+          }
         }
       }
     },

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

@@ -4,7 +4,6 @@ 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;
@@ -55,7 +54,6 @@ public class UserModelCollectController extends BaseCRUDJsonBodyMappingControlle
 
 
     @PostMapping({"get"})
-    @UnAuth
     public String getCollect(@RequestBody UserModelCollectEntity query) {
 
         Map<String, Object> model = new HashMap();
@@ -125,22 +123,21 @@ 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();
         int code = 1;
         String busiDesc = "保存" + this.getModuleDesc();
-        if(StringUtils.isEmpty(entity.getModelIds())){
-            return this.createFailJsonResp("请选择要收藏的模块");
-        }
+//        if(StringUtils.isEmpty(entity.getModelIds())){
+//            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());
+            query.setSiteId(entity.getSiteId());
             UserModelCollectEntity temp = this.service.selectOne(query);
             if (temp == null) {
                 Class<UserModelCollectEntity> tClass = ReflectUtils.getClassGenricType(this.getClass(), 1);