功能调整

hx-common/src/main/java/com/fjhx/common/utils/AuthorityUtils.java

@@ -2,7 +2,6 @@ package com.fjhx.common.utils;
 
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.utils.SecurityUtils;
 
 import java.util.List;
 import java.util.Objects;
@@ -12,8 +11,7 @@ public class AuthorityUtils {
 	/**
 	 * 高权限判断
 	 */
-	private static boolean isHighAuthority() {
-		SysUser user = SecurityUtils.getLoginUser().getUser();
+	public static boolean isHighAuthority(SysUser user) {
 		List<SysRole> sysRoleList = user.getRoles();
 		boolean flag = false;
 		for (SysRole sysRole : sysRoleList) {
@@ -23,9 +21,7 @@ public class AuthorityUtils {
 //		1.角色是高权限 And 归属集团[000000租户]，看所有数据不限制
 //		2.角色是高权限，看所在公司的所有数据
 //		3.角色是低权限，看自己的数据
-
-
-		return false;
+		return flag;
 	}
 
 }

hx-mes/src/main/java/com/fjhx/mes/entity/technology/po/Technology.java

@@ -38,4 +38,14 @@ public class Technology extends BasePo {
      */
     private String nodeObject;
 
+    /**
+     * 是否批量模式1是0否
+     */
+    private Integer isBatchMode;
+
+    /**
+     * 生产任务id
+     */
+    private Long productionTaskId;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -31,6 +31,7 @@ import com.fjhx.common.service.contract.ContractTemplateService;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.common.service.documentary.GetDocumentaryBusinessTemplate;
 import com.fjhx.common.utils.Assert;
+import com.fjhx.common.utils.AuthorityUtils;
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
 import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.service.customer.CustomerService;
@@ -311,6 +312,14 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
      * @param wrapper
      */
     private void setContractParam(ContractSelectDto dto, IWrapper<Contract> wrapper) {
+        //权限过滤
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        if (!AuthorityUtils.isHighAuthority(user)) {
+            //用户角色是低权限
+        } else if (AuthorityUtils.isHighAuthority(user) && !Objects.equals(user.getCompanyId(), 100)) {
+            //用户角色是高权限,且不是集团用户
+        }
+
         wrapper.orderByDesc("t1", Contract::getCreateTime);
         if (StringUtils.isNotEmpty(dto.getStatus())) {
             wrapper.eq("t1", Contract::getStatus, dto.getStatus());