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

db/add.sql

 -- ----------------------------
-2023-9-11
+-- 2023-9-11
 -- ----------------------------
 ALTER TABLE mortals_xhx_user ADD COLUMN  `staffId` varchar(64)      COMMENT '员工Id，关联用户员工表';
 ALTER TABLE mortals_xhx_user ADD COLUMN  `openId` varchar(64)      COMMENT '微信openId';
@@ -108,3 +108,10 @@ CREATE TABLE mortals_xhx_news_up(
 PRIMARY KEY  (`id`)
 ,KEY `upName` (`upName`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='新闻点赞记录信息';
+
+
+-- ----------------------------
+-- 2024-12-5
+-- ----------------------------
+ALTER TABLE mortals_xhx_company ADD COLUMN   `background` varchar(256)   default ''  COMMENT '背景图片';
+

enterprise-manager/pom.xml

@@ -14,6 +14,22 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <!-- 默认值 -->
+        <profiles.server.debug></profiles.server.debug>
+        <profiles.server.path>/enterprise</profiles.server.path>
+        <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
+        <profiles.log.level>info</profiles.log.level>
+        <profiles.publish.path>/home/publish</profiles.publish.path>
+        <profiles.filepath>/mortals/app/data</profiles.filepath>
+        <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
+        <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
+        <profiles.req.json.check>false</profiles.req.json.check>
+        <profiles.trustedReferer></profiles.trustedReferer>
+        <package.environment>build</package.environment>
+        <skipUi>true</skipUi>
+    </properties>
+
     <profiles>
         <profile>
             <id>develop</id>
@@ -42,6 +58,7 @@
                 <profiles.active>test</profiles.active>
                 <profiles.platform.type>standalone</profiles.platform.type>
                 <profiles.server.port>21086</profiles.server.port>
+                <profiles.server.debug>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=6519</profiles.server.debug>
                 <profiles.server.path>/enterprise</profiles.server.path>
                 <profiles.publish.path>/home/publish</profiles.publish.path>
                 <profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
@@ -55,36 +72,25 @@
                 <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <profiles.log.level>INFO</profiles.log.level>
                 <package.environment>test</package.environment>
-                <skipUi>false</skipUi>
+                <skipUi>true</skipUi>
             </properties>
         </profile>
         <profile>
             <id>product</id>
             <properties>
                 <profiles.active>product</profiles.active>
-                <profiles.platform.type>cloud</profiles.platform.type>
-                <profiles.server.port>11086</profiles.server.port>
-                <profiles.server.path>/office</profiles.server.path>
-                <profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr>
+                <profiles.platform.type>standalone</profiles.platform.type>
+                <profiles.server.port>21086</profiles.server.port>
+                <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
                 <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
                 <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
-                <profiles.rabbitmq.host>172.15.28.115</profiles.rabbitmq.host>
-                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
-                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
-                <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
-                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
-                <profiles.log.level>info</profiles.log.level>
-                <profiles.publish.path>/home/publish</profiles.publish.path>
-                <package.environment>build</package.environment>
-                <skipUi>false</skipUi>
+                <package.environment>build:prod</package.environment>
+                <skipDeploy>true</skipDeploy>
             </properties>
         </profile>
 
     </profiles>
 
-    <properties>
-    </properties>
 
     <dependencies>
 

enterprise-manager/src/main/bin/deploy.sh

@@ -14,7 +14,7 @@ SHELL_LOG="${BASEDIR}/${SHELL_NAME}.log"
 
 JAVA_HOME="/usr/local/java/jdk1.8"
 SERVICE_PATH="/usr/lib/systemd/system"
-PUBLISH_PATH="@profiles.publish.path@"
+PUBLISH_PATH="/home/publish"
 PROJECT_NAME="@project.artifactId@"
 
 PROJECT_EXECPATH="${PUBLISH_PATH}/${PROJECT_NAME}"
@@ -35,7 +35,7 @@ clear_deploy() {
   SERVICE=$1
   EXECPATH=$2
   #清理后台自启服务
-  rm -rf ${SERVICE}
+  rm -f ${SERVICE}
   #清理执行文件目录
   rm -rf ${EXECPATH}
 }
@@ -58,6 +58,7 @@ build_service() {
   echo "[Service]" >>${SERVICE}
   echo "Environment=\"JAVA_HOME=$JAVA_HOME\"" >>${SERVICE}
   echo "Type=forking" >>${SERVICE}
+  echo "ExecStartPre=-/bin/sleep 5s" >>${SERVICE}
   echo "ExecStart=${EXECPATH}/bin/start.sh" >>${SERVICE}
   echo "ExecStop=${EXECPATH}/bin/shutdown.sh" >>${SERVICE}
   echo "PrivateTmp=true" >>${SERVICE}
@@ -103,8 +104,11 @@ project_ui_deploy() {
 main() {
   echo "后台服务部署"
   project_deploy
-  echo "前端服务部署"
-  project_ui_deploy
+  #判断是否需要部署ui
+  if [ "@skipUi@" == "false" ];then
+    echo "前端服务部署"
+    project_ui_deploy
+  fi;
   exit ${RETVAL}
 }
 

enterprise-manager/src/main/bin/shutdown.sh

-#! /bin/sh
+#!/bin/sh
 PORT="@profiles.server.port@"
-BASEDIR=$(dirname $0)
-BASEDIR=$( (
-  cd "$BASEDIR"
-  pwd
-))
+BASEDIR=`dirname $0`
+BASEDIR=`(cd "$BASEDIR"; pwd)`
 PROJECT_NAME="@project.artifactId@"
-MAIN_CLASS="$PROJECT_NAME"
-
-if [ ! -n "$PORT" ]; then
-  echo $"Usage: $0 {port}"
-  exit $FAIL
+MAIN_CLASS="$PROJECT_NAME";
+SUCCESS=0
+FAIL=9
+if [ ! -n "$PORT" ]; then  
+	echo $"Usage: $0 {port}"
+	exit $FAIL
 fi
 
-pid=$(ps ax | grep -i "$MAIN_CLASS" | grep java | grep -v grep | awk '{print $1}')
-if [ -z "$pid" ]; then
-  echo "No Server running."
-  exit 1
+
+pid=`ps ax | grep -i "$MAIN_CLASS"  | grep java | grep -v grep | awk '{print $1}'`
+if [ -z "$pid" ] ; then
+        echo "No Server running."
+        exit $FAIL;
 fi
 
 echo "stoping application $PROJECT_NAME......"
@@ -24,3 +23,5 @@ echo "stoping application $PROJECT_NAME......"
 kill -15 ${pid}
 
 echo "Send shutdown request to Server $PROJECT_NAME OK"
+
+

enterprise-manager/src/main/bin/start.sh

 #!/bin/sh
 PORT="@profiles.server.port@"
+DEBUG=@profiles.server.debug@
 BASEDIR=`dirname $0`/..
 BASEDIR=`(cd "$BASEDIR"; pwd)`
 PROJECT_NAME="@project.artifactId@";
 MAIN_CLASS="$PROJECT_NAME-@project.version@.jar";
 LOG_PATH="@profiles.log.path@/$PROJECT_NAME"
-GC_PATH=$LOG_PATH/PROJECT_NAME"-gc.log"
-HS_ERR_PATH=$LOG_PATH/PROJECT_NAME"-hs_err.log"
-HEAP_DUMP_PATH=$LOG_PATH/PROJECT_NAME"-heap_dump.hprof"
+GC_PATH=$LOG_PATH/$PROJECT_NAME"-gc.log"
+HS_ERR_PATH=$LOG_PATH/$PROJECT_NAME"-hs_err.log"
+HEAP_DUMP_PATH=$LOG_PATH/$PROJECT_NAME"-heap_dump.hprof"
 TEMP_PATH=$LOG_PATH/temp/
 SUCCESS=0
 FAIL=9
@@ -32,8 +33,9 @@ if [ -z "$JAVACMD" ] ; then
       JAVACMD="$JAVA_HOME/bin/java"
     fi
   else
-    JAVACMD=`which java`
-	echo  "Error: JAVA_HOME is $JAVACMD"
+    JAVACMD=`which java > /dev/null 2>&1`
+	echo  "Error: JAVA_HOME is not defined correctly."
+    exit $ERR_NO_JAVA
   fi
 fi
 
@@ -44,7 +46,7 @@ fi
 
 if [ -e "$BASEDIR" ]
 then
-  JAVA_OPTS="-Xms512M -Xmx1024M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$GC_PATH -XX:+HeapDumpOnOutOfMemoryError -XX:ErrorFile=$HS_ERR_PATH -XX:HeapDumpPath=$HEAP_DUMP_PATH"
+  JAVA_OPTS="-Xms128M -Xmx512M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$GC_PATH -XX:+HeapDumpOnOutOfMemoryError -XX:ErrorFile=$HS_ERR_PATH -XX:HeapDumpPath=$HEAP_DUMP_PATH"
 fi
 
 CLASSPATH=$CLASSPATH_PREFIX:
@@ -55,12 +57,12 @@ cd "$BASEDIR/boot";
 echo "starting application $PROJECT_NAME......"
 exec "$JAVACMD" $JAVA_OPTS \
 				$EXTRA_JVM_ARGUMENTS \
+				$DEBUG \
 				-Dapp.name="$PROJECT_NAME" \
 				-Dapp.port="$PORT" \
 				-Dbasedir="$BASEDIR" \
+				-Dfile.encoding=utf-8 \
 				-Djava.io.tmpdir=$TEMP_PATH \
-				-Dloader.path="file://$BASEDIR/conf,file://$BASEDIR/lib" \
-				-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=41086 \
 				-jar $MAIN_CLASS \
 				> /dev/null &
 				

enterprise-manager/src/main/java/com/mortals/xhx/busiz/controller/TestIdempotentController.java

 package com.mortals.xhx.busiz.controller;
 
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.idempotent.helper.IdempotentHelper;
 import com.mortals.xhx.busiz.service.TestIdempotentService;
 import lombok.extern.slf4j.Slf4j;
@@ -28,6 +29,7 @@ public class TestIdempotentController {
      * url: localhost:12345/v1/idempotent/test-with-result?source=taobao&operationType=publish_product&businessKey=pd_20230105007&name=lisi
      */
     @GetMapping("/test-with-result")
+    @UnAuth
     public String testWithResult(String source,
                                  String operationType,
                                  String businessKey,
@@ -44,6 +46,7 @@ public class TestIdempotentController {
      * url : localhost:12345/v1/idempotent/test-with-no-result?source=taobao&operationType=publish_product&businessKey=pd_20230105008&name=zhangsan
      */
     @GetMapping("/test-with-no-result")
+    @UnAuth
     public String testWithNoResult(String source,
                                    String operationType,
                                    String businessKey,

enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyEntity.java

@@ -13,150 +13,154 @@ import com.mortals.xhx.module.company.model.vo.CompanyVo;
 import com.mortals.xhx.module.company.model.CompanyLabelsEntity;
 import lombok.Data;
 /**
-* 公司实体对象
-*
-* @author zxfei
-* @date 2023-09-18
-*/
+ * 公司实体对象
+ *
+ * @author zxfei
+ * @date 2024-12-05
+ */
 @Data
 public class CompanyEntity extends CompanyVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 公司名称
-    */
+     * 公司名称
+     */
     @Excel(name = "公司名称")
     private String companyName;
     /**
-    * 公司编码
-    */
+     * 公司编码
+     */
     private String companyCode;
     /**
-    * 注册号
-    */
+     * 注册号
+     */
     private String registrationNumber;
     /**
-    * 法定代表人
-    */
+     * 法定代表人
+     */
     private String legalRepresentative;
     /**
-    * 注册资本
-    */
+     * 注册资本
+     */
     private String registeredCapital;
     /**
-    * 公司类型
-    */
+     * 公司类型
+     */
     private String companyType;
     /**
-    * 经营范围
-    */
+     * 经营范围
+     */
     private String businessScope;
     /**
-    * 经营地址
-    */
+     * 经营地址
+     */
     private String businessAdress;
     /**
-    * 所在地
-    */
+     * 所在地
+     */
     private String location;
     /**
-    * 所属区域编码
-    */
+     * 所属区域编码
+     */
     private String areaCode;
     /**
-    * 所属区域名称
-    */
+     * 所属区域名称
+     */
     private String areaName;
     /**
-    * 联系电话
-    */
+     * 联系电话
+     */
     private String contactPhone;
     /**
-    * 电子邮件地址
-    */
+     * 电子邮件地址
+     */
     private String email;
     /**
-    * 公司网站
-    */
+     * 公司网站
+     */
     private String website;
     /**
-    * 税务登记号
-    */
+     * 税务登记号
+     */
     private String taxRegistrationNumber;
     /**
-    * 社会信用代码
-    */
+     * 社会信用代码
+     */
     private String socialCreditCode;
     /**
-    * 商标信息
-    */
+     * 商标信息
+     */
     private String trademarkInfo;
     /**
-    * 网站历史备案信息
-    */
+     * 网站历史备案信息
+     */
     private String websiteRegistrationInfo;
     /**
-    * 员工总数
-    */
+     * 员工总数
+     */
     private Integer totalEmployees;
     /**
-    * 软件著作权数量
-    */
+     * 软件著作权数量
+     */
     private Integer softNum;
     /**
-    * 专利数量
-    */
+     * 专利数量
+     */
     private Integer patentNum;
     /**
-    * 历史发展
-    */
+     * 历史发展
+     */
     private String hisDevelop;
     /**
-    * 经度
-    */
+     * 经度
+     */
     private String lon;
     /**
-    * 纬度
-    */
+     * 纬度
+     */
     private String lati;
     /**
-    * 企业logo
-    */
+     * 企业logo
+     */
     private String logoPath;
     /**
-    * 企业视频
-    */
+     * 企业视频
+     */
     private String companyVideoPath;
     /**
-    * 企业宣传图片
-    */
+     * 企业宣传图片
+     */
     private String companyPicPath;
     /**
-    * 公司介绍
-    */
+     * 公司介绍
+     */
     private String companyIntroduction;
     /**
-    * 公司文化
-    */
+     * 公司文化
+     */
     private String companyCulture;
     /**
-    * 排序
-    */
+     * 排序
+     */
     private Integer sort;
     /**
-    * 成立日期
-    */
+     * 成立日期
+     */
     private Date establishDate;
     /**
-    * 备注
-    */
+     * 备注
+     */
     private String remark;
     /**
-    * 公司标注信息
-    */
+     * 背景图片
+     */
+    private String background;
+    /**
+     * 公司标注信息
+     */
     private List<CompanyLabelsEntity> companyLabelsList=new ArrayList<>();;
     public List<CompanyLabelsEntity> getCompanyLabelsList(){
-      return companyLabelsList;
+        return companyLabelsList;
     }
 
     public void setCompanyLabelsList(List<CompanyLabelsEntity> companyLabelsList){
@@ -164,7 +168,7 @@ public class CompanyEntity extends CompanyVo {
     }
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -172,44 +176,45 @@ public class CompanyEntity extends CompanyVo {
         if (obj instanceof CompanyEntity) {
             CompanyEntity tmp = (CompanyEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
     }
 
     public void initAttrValue(){
-            this.companyName = "";
-            this.companyCode = "";
-            this.registrationNumber = "";
-            this.legalRepresentative = "";
-            this.registeredCapital = "";
-            this.companyType = "";
-            this.businessScope = "";
-            this.businessAdress = "";
-            this.location = "";
-            this.areaCode = "";
-            this.areaName = "";
-            this.contactPhone = "";
-            this.email = "";
-            this.website = "";
-            this.taxRegistrationNumber = "";
-            this.socialCreditCode = "";
-            this.trademarkInfo = "";
-            this.websiteRegistrationInfo = "";
-            this.totalEmployees = 0;
-            this.softNum = 0;
-            this.patentNum = 0;
-            this.hisDevelop = "";
-            this.lon = "";
-            this.lati = "";
-            this.logoPath = "";
-            this.companyVideoPath = "";
-            this.companyPicPath = "";
-            this.companyIntroduction = "";
-            this.companyCulture = "";
-            this.sort = 0;
-            this.establishDate = new Date();
-            this.remark = "";
+        this.companyName = "";
+        this.companyCode = "";
+        this.registrationNumber = "";
+        this.legalRepresentative = "";
+        this.registeredCapital = "";
+        this.companyType = "";
+        this.businessScope = "";
+        this.businessAdress = "";
+        this.location = "";
+        this.areaCode = "";
+        this.areaName = "";
+        this.contactPhone = "";
+        this.email = "";
+        this.website = "";
+        this.taxRegistrationNumber = "";
+        this.socialCreditCode = "";
+        this.trademarkInfo = "";
+        this.websiteRegistrationInfo = "";
+        this.totalEmployees = 0;
+        this.softNum = 0;
+        this.patentNum = 0;
+        this.hisDevelop = "";
+        this.lon = "";
+        this.lati = "";
+        this.logoPath = "";
+        this.companyVideoPath = "";
+        this.companyPicPath = "";
+        this.companyIntroduction = "";
+        this.companyCulture = "";
+        this.sort = 0;
+        this.establishDate = null;
+        this.remark = "";
+        this.background = "";
     }
 }
\ No newline at end of file

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

@@ -86,7 +86,34 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
     @Autowired
     private LabelsService labelsService;
 
+    @Override
+    protected void findAfter(CompanyEntity params,PageInfo pageInfo, Context context, List<CompanyEntity> list) throws AppException {
+        fillSubData(list);
+        super.findAfter(params,pageInfo, context, list);
+    }
+    @Override
+    protected void findAfter(CompanyEntity params, Context context, List<CompanyEntity> list) throws AppException {
+        fillSubData(list);
+        super.findAfter(params, context, list);
+    }
+
+    private void fillSubData(List<CompanyEntity> list) {
+        List<Long> idList = list.stream().map(i -> i.getId()).collect(Collectors.toList());
+        if(ObjectUtils.isEmpty(idList))return;
+        Map<Long, List<CompanyLabelsEntity>> companyLabelsListMap = companyLabelsService
+                .find(new CompanyLabelsQuery().companyIdList(idList)).parallelStream()
+                .collect(Collectors.groupingBy(CompanyLabelsEntity::getCompanyId));
+
+        List<CompanyPatentEntity> companyPatentEntities = companyPatentService.find(new CompanyPatentQuery().companyIdList(idList));
+        Map<Long, List<CompanyPatentEntity>> companyPatentListMap = companyPatentEntities.parallelStream().collect((Collectors.groupingBy(CompanyPatentEntity::getCompanyId)));
+
+        list.forEach(item -> {
+            item.setCompanyLabelsList(companyLabelsListMap.get(item.getId()));
+            item.setCompanyPatentsList(companyPatentListMap.get(item.getId()));
+        });
+    }
 
+/*
     @Override
     protected void findAfter(CompanyEntity params, PageInfo pageInfo, Context context, List<CompanyEntity> list) throws AppException {
 
@@ -95,6 +122,7 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
             item.setCompanyPatentsList(companyPatentEntities);
         }).count();
     }
+*/
 
     @Override
     protected void saveAfter(CompanyEntity entity, Context context) throws AppException {

enterprise-manager/src/main/java/com/mortals/xhx/module/company/web/CompanyController.java

@@ -7,8 +7,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.YesNoEnum;
-import com.mortals.xhx.module.company.model.CompanyPatentEntity;
-import com.mortals.xhx.module.company.model.CompanyPatentQuery;
+import com.mortals.xhx.module.company.model.*;
 import com.mortals.xhx.module.company.model.vo.HomeStatInfo;
 import com.mortals.xhx.module.company.service.CompanyLabelsService;
 import com.mortals.xhx.module.company.service.CompanyPatentService;
@@ -26,7 +25,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.company.model.CompanyEntity;
 import com.mortals.xhx.module.company.service.CompanyService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
@@ -62,6 +60,9 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
     private LabelsService labelsService;
     @Autowired
     private CompanyPatentService companyPatentService;
+    @Autowired
+    private CompanyLabelsService companyLabelsService;
+
 
 
     public CompanyController() {
@@ -84,6 +85,10 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
     protected int editAfter(Long id, Map<String, Object> model, CompanyEntity entity, Context context) throws AppException {
 
         List<CompanyPatentEntity> companyPatentEntities = companyPatentService.find(new CompanyPatentQuery().companyId(entity.getId()));
+
+        List<CompanyLabelsEntity> companyLabelsEntities = companyLabelsService.find(new CompanyLabelsQuery().companyId(entity.getId()));
+
+        entity.setCompanyLabelsList(companyLabelsEntities);
         entity.setCompanyPatentsList(companyPatentEntities);
 
 
@@ -95,6 +100,8 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
     protected int viewAfter(Long id, Map<String, Object> model, CompanyEntity entity, Context context) throws AppException {
 
         List<CompanyPatentEntity> companyPatentEntities = companyPatentService.find(new CompanyPatentQuery().companyId(entity.getId()));
+        List<CompanyLabelsEntity> companyLabelsEntities = companyLabelsService.find(new CompanyLabelsQuery().companyId(entity.getId()));
+        entity.setCompanyLabelsList(companyLabelsEntities);
         entity.setCompanyPatentsList(companyPatentEntities);
 
         return super.viewAfter(id, model, entity, context);

enterprise-manager/src/main/java/com/mortals/xhx/module/news/service/impl/NewsServiceImpl.java

@@ -54,7 +54,7 @@ public class NewsServiceImpl extends AbstractCRUDServiceImpl<NewsDao, NewsEntity
                 List<NewsUpEntity> upList = newsUpService.find(new NewsUpQuery().newsIdList(newsIdList).upId(context.getUser().getId()));
                 Map<Long,NewsUpEntity> upMap = new HashMap<>();
                 if(CollectionUtils.isNotEmpty(upList)){
-                    upMap = upList.parallelStream().collect(Collectors.toMap(x -> x.getId(), z -> z, (o, n) -> n));
+                    upMap = upList.parallelStream().collect(Collectors.toMap(x -> x.getNewsId(), z -> z, (o, n) -> n));
                 }
                 List<NewsShareEntity> shareList = newsShareService.find(new NewsShareQuery().newsIdList(newsIdList).createUserId(context.getUser().getId()));
                 Map<Long,NewsShareEntity> shareMap = new HashMap<>();

enterprise-manager/src/test/java/com/mortals/httpclient/company/CompanyController.http

@@ -14,10 +14,11 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 %}
 
 ###公司列表
-POST {{baseUrl}}/company/list
+POST {{baseUrl}}/company/interlist
 Content-Type: application/json
 
 {
+  "id": 5,
     "page":1,
     "size":10
 }