fix: 企业关联关系

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/UpmsType.java

@@ -85,11 +85,7 @@ public final class UpmsType {
 	@AllArgsConstructor
 	public enum ProductLine {
 
-		CMO("CMO", "药企"),
-		CSO("CSO", "CSO"),
-		NET_MED("NET_MED", "互联网医疗"),
-		MED_MED("MED_MED", "医学传媒"),
-		ACD_GROUP("ACD_GROUP", "自营学术团队");
+		CSO1("CSO1", "CSO1");
 
 		@EnumValue
 		private final String type;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysEnterpriseRelationController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.vo.SysEnterpriseRelationVO;
 import com.qunzhixinxi.hnqz.admin.service.SysEnterpriseRelationService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
+import com.qunzhixinxi.hnqz.common.security.annotation.Inner;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +34,7 @@ public class SysEnterpriseRelationController {
 	 * @param page 分页参数
 	 * @return 分页
 	 */
+	@Inner(value = false)
 	@GetMapping(value = "/page")
 	public R<Page<SysEnterpriseRelationVO>> pageEntRels(Page<SysEnterpriseRelationVO> page) {
 		return R.ok(enterpriseRelationService.pageEntRels(page));

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/SysDeptMapper.xml

@@ -47,14 +47,14 @@
 	</resultMap>
 
 	<resultMap id="sysEntRelMap" type="com.qunzhixinxi.hnqz.admin.api.vo.SysEnterpriseRelationVO">
-		<id property="relId" column="dept_id"/>
-		<result property="entId" column="name"/>
-		<result property="entName" column="sort"/>
-		<result property="rootId" column="parent_id"/>
-		<result property="rootName" column="tenant_id"/>
-		<result property="entType" column="dept_code"/>
-		<result property="productLine" column="level"/>
-		<result property="entLevel" column="level1_name"/>
+		<id property="relId" column="rel_id"/>
+		<result property="entId" column="ent_id"/>
+		<result property="entName" column="ent_name"/>
+		<result property="rootId" column="root_id"/>
+		<result property="rootName" column="root_name"/>
+		<result property="entType" column="ent_type"/>
+		<result property="productLine" column="product_line"/>
+		<result property="entLevel" column="ent_level"/>
 	</resultMap>
 
 	<select id="selectDistinctDeptId" resultMap="sysDeptMap">
@@ -236,13 +236,13 @@
 
 	<select id="pageEntRels" resultMap="sysEntRelMap">
 		SELECT el.rel_id,
-			   d.dept_id   AS `entId`,
-			   d.name      AS `entName`,
-			   d1.dept_id  AS `rootId`,
-			   d1.name     AS `rootName`,
-			   el.e_type   AS `entType`,
-			   el.pro_line AS `productLine`,
-			   el.e_level  AS `entLevel`
+			   d.dept_id   AS `ent_id`,
+			   d.name      AS `ent_name`,
+			   d1.dept_id  AS `root_id`,
+			   d1.name     AS `root_name`,
+			   el.e_type   AS `ent_type`,
+			   el.pro_line AS `product_line`,
+			   el.e_level  AS `ent_level`
 		FROM sys_dept d
 				 LEFT JOIN sys_ent_rel el ON el.ent_id = d.dept_id
 				 LEFT JOIN sys_dept d1 ON el.root_id = d1.dept_id