Merge branch 'master' of http://gitlab.scsmile.cn/zxf/enterprise-platform

enterprise-manager/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java

@@ -55,7 +55,7 @@ public class UploadServiceImpl implements UploadService {
             log.error("文件上传大小超过限制，当前文件---" + tempFile.getSize() + "，允许大小----------" + type.getMaxSize());
             throw new AppException("文件上传大小超过限制！");
         }
-        if (null != fileName && fileName.length() > 50) {
+        if (null != fileName && fileName.length() > 120) {
             throw new AppException("文件名称过长，无法上传！");
         }
 

enterprise-manager/src/main/java/com/mortals/xhx/base/system/user/model/vo/UserVo.java

@@ -39,4 +39,6 @@ public class UserVo extends BaseEntityLong {
      * 过期时间
      */
     private Long expireTime;
+    /** 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2列表 */
+    private List <Integer> userTypeList;
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/NewsApiController.java

 package com.mortals.xhx.busiz.applets.web;
 
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
@@ -74,6 +75,7 @@ public class NewsApiController extends AbstractBaseController<NewsReq> {
      * 新闻频道分类
      */
     @PostMapping(value = "categoryList")
+    @UnAuth
     public Rest<Object> categoryList(){
         String busiDesc = "新闻频道";
         Rest<Object> rest = Rest.ok();
@@ -91,6 +93,7 @@ public class NewsApiController extends AbstractBaseController<NewsReq> {
      * 新闻列表
      */
     @PostMapping(value = "newsList")
+    @UnAuth
     public Rest<Object> newsList(@RequestBody NewsReq newsReq) {
         String busiDesc = "新闻列表";
         log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(newsReq));
@@ -108,7 +111,7 @@ public class NewsApiController extends AbstractBaseController<NewsReq> {
                query.setCategoryId(newsReq.getNewsCategoryId());
             }
 
-            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("top", OrderCol.DESCENDING),new OrderCol("createTime", OrderCol.DESCENDING)));
             Result<NewsEntity> result = newsService.find(query, pageInfo, context);
             result.getList().forEach(item->{
                 item.setContent(null);
@@ -135,6 +138,7 @@ public class NewsApiController extends AbstractBaseController<NewsReq> {
      * 新闻详细
      */
     @PostMapping(value = "newsInfo")
+    @UnAuth
     public Rest<NewsEntity> appealInfo(@RequestBody NewsReq newsReq) {
         String busiDesc = "新闻详细";
         log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(newsReq));
@@ -161,6 +165,7 @@ public class NewsApiController extends AbstractBaseController<NewsReq> {
      * 新闻点赞
      */
     @PostMapping(value = "up")
+    @UnAuth
     public Rest<NewsEntity> upNews(@RequestBody NewsReq newsReq) {
         String busiDesc = "新闻点赞";
         log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(newsReq));

enterprise-manager/src/main/java/com/mortals/xhx/module/company/service/impl/CompanyServiceImpl.java

@@ -220,7 +220,7 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
         int productNums = productService.count(new ProductQuery(), context);
         homeStatInfo.setProductNums(productNums);
 
-        List<StaffEntity> staffList = staffService.find(new StaffQuery(), context);
+        List<StaffEntity> staffList = staffService.find(new StaffQuery().staffStatusList(Arrays.asList(1,2)), context);
 
         homeStatInfo.setStaffNums(staffList.size());
 
@@ -312,4 +312,5 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
         }
         return entity;
     }
+
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/favorites/web/FavoritesBusinesscardController.java

@@ -3,6 +3,8 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
+import com.mortals.xhx.module.bussinesscard.model.BussinesscardQuery;
+import com.mortals.xhx.module.bussinesscard.service.BussinesscardService;
 import com.mortals.xhx.module.staff.model.StaffQuery;
 import com.mortals.xhx.module.staff.service.StaffService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +45,7 @@ public class FavoritesBusinesscardController extends BaseCRUDJsonBodyMappingCont
     @Autowired
     private UserService userService;
     @Autowired
-    private StaffService staffService;
+    private BussinesscardService bussinesscardService;
 
 
     public FavoritesBusinesscardController(){
@@ -55,6 +57,7 @@ public class FavoritesBusinesscardController extends BaseCRUDJsonBodyMappingCont
         super.init(model, context);
         this.addDict(model, "userId", userService.find(new UserQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
         this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
+        this.addDict(model, "bussinesscardId", bussinesscardService.find(new BussinesscardQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName(), (o, n) -> n)));
 
     }
 

enterprise-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackServiceImpl.java

@@ -90,4 +90,24 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
             }
         }
     }
+
+    @Override
+    public FeedbackEntity get(Long key, Context context) throws AppException {
+        FeedbackEntity entity = this.dao.get(key);
+        if(entity!=null){
+            UserEntity userEntity = userService.get(entity.getCreateUserId());
+            if(userEntity!=null) {
+                entity.setPhotoPath(userEntity.getPhotoPath());
+                entity.setFeedbackName(userEntity.getRealName());
+                entity.setCompanyName(userEntity.getCompanyAdress());
+                if(StringUtils.isEmpty(entity.getEmail())){
+                    entity.setEmail(userEntity.getEmail());
+                }
+                if(StringUtils.isEmpty(entity.getContactInfo())){
+                    entity.setContactInfo(userEntity.getPhone());
+                }
+            }
+        }
+        return entity;
+    }
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/news/web/NewsController.java

@@ -2,6 +2,9 @@ package com.mortals.xhx.module.news.web;
 
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.base.system.user.model.UserQuery;
@@ -89,8 +92,8 @@ public class NewsController extends BaseCRUDJsonBodyMappingController<NewsServic
         }
 
         if (!ObjectUtils.isEmpty(entity.getDeptId())) {
-            DeptEntity deptEntity = deptService.get(entity.getDeptId(), context);
-            entity.setDeptName(deptEntity.getDeptName());
+            Map<String,String> deptMap = paramService.getParamBySecondOrganize("News","deptId");
+            entity.setDeptName(deptMap.get(entity.getDeptId()));
         }
 
     }
@@ -144,4 +147,9 @@ public class NewsController extends BaseCRUDJsonBodyMappingController<NewsServic
         }
         return rest;
     }
+
+    @Override
+    protected void doListBefore(NewsEntity query, Map<String, Object> model, Context context) throws AppException {
+        query.setOrderColList(Arrays.asList(new OrderCol("top", OrderCol.DESCENDING),new OrderCol("createTime", OrderCol.DESCENDING)));
+    }
 }
\ No newline at end of file