'公式作用域相关修改'

blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java

@@ -46,7 +46,7 @@ import org.springframework.transaction.annotation.Transactional;
 @AllArgsConstructor
 public class LeaveServiceImpl extends BaseServiceImpl<LeaveMapper, ProcessLeave> implements ILeaveService {
 
-	private final IFlowClient flowClient;
+//	private final IFlowClient flowClient;
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -65,7 +65,8 @@ public class LeaveServiceImpl extends BaseServiceImpl<LeaveMapper, ProcessLeave>
 				.set("taskUser", TaskUtil.getTaskUser(leave.getTaskUser()))
 				//这个key属于条件判断的key，可以各自流程自定义也可以每种流程唯一
 				.set("days", DateUtil.between(leave.getStartTime(), leave.getEndTime()).toDays());
-			R<BladeFlow> result = flowClient.startProcessInstanceById(leave.getProcessDefinitionId(), FlowUtil.getBusinessKey(businessTable, String.valueOf(leave.getId())), variables);
+			//R<BladeFlow> result = flowClient.startProcessInstanceById(leave.getProcessDefinitionId(), FlowUtil.getBusinessKey(businessTable, String.valueOf(leave.getId())), variables);
+			R<BladeFlow> result = null;
 			if (result.isSuccess()) {
 				log.debug("流程已启动,流程ID:" + result.getData().getProcessInstanceId());
 				// 返回流程id写入leave

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeMapper.xml

@@ -370,7 +370,11 @@
         select f_id,e_key,a.id,e_name,e_type,e_length,e_allow_deviation,e_Inspection_method,CONCAT(b.init_table_name,':',e_key) as tableElementKey,init_table_name as initTableName,
                b.parent_id as nodeId
         from m_wbs_form_element a inner join m_wbs_tree b on a.f_id=b.init_table_id
-        where b.id=#{id} and a.is_deleted=0
+        where b.id=#{id} and a.is_deleted=0  union
+        select f_id,e_key,a.id,e_name,e_type,e_length,e_allow_deviation,e_Inspection_method,CONCAT(b.init_table_name,':',e_key) as tableElementKey,init_table_name as initTableName,
+               b.parent_id as nodeId
+        from m_wbs_form_element a inner join m_wbs_tree_private b on a.f_id=b.init_table_id
+        where b.p_key_id=#{id} and a.is_deleted=0
     </select>
     <select id="selectFormElements4TableId" resultMap="wbsFormElementMap">
         select b.id,IF(c.formula_id>0,1,0)globalFormula ,b.e_name,e_type,e_length,e_allow_deviation,e_Inspection_method,CONCAT(a.tab_en_name,':',e_key) as tableElementKey,a.tab_en_name as initTableName from (select * from m_table_info where id=#{id}) a INNER JOIN  m_wbs_form_element b on a.id =b.f_id LEFT JOIN(select element_id ,formula_id from m_element_formula_mapping where scope=0 )c on b.id=c.element_id  where b.is_deleted=0

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -392,9 +392,9 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     public List<WbsFormElementVO> selectFormElements(String id, Long nodeId,Integer type) {
         List<WbsFormElementVO> wbsFormElements = wbsTreeMapper.selectFormElements(id);
         ;
-        if (Func.isEmpty(wbsFormElements)) {
-            wbsFormElements = wbsTreeMapper.selectFormElements4TableId(id);
-        }
+//        if (Func.isEmpty(wbsFormElements)) {
+//            wbsFormElements = wbsTreeMapper.selectFormElements4TableId(id);
+//        }
         wbsFormElements.forEach(elements -> {
             String eAllowDeviation = elements.getEAllowDeviation();
             //转义
@@ -412,7 +412,13 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
             wbsFormElements.forEach(e -> {
                 e.setGlobalFormula(longs.contains(e.getId()) ? 1 : 0);
             });
-            List<Long> longs2 = this.jdbcTemplate.queryForList("select c.element_id from m_wbs_tree a INNER JOIN m_wbs_tree b on a.parent_id=b.id INNER JOIN m_element_formula_mapping c on b.id=c.node_id where  a.id=" + id + " and c.scope="+scopeB+" and c.element_id in(" + elementIds + ")", Long.class);
+            String sql;
+            if(com.mixsmart.utils.StringUtils.isEquals(type,1)){
+                sql="select c.element_id from m_wbs_tree a INNER JOIN m_wbs_tree b on a.parent_id=b.id INNER JOIN m_element_formula_mapping c on b.id=c.node_id where  a.id=" + id + " and c.scope="+scopeB+" and c.element_id in(" + elementIds + ")";
+            }else{
+                sql="select c.element_id from m_wbs_tree_private a INNER JOIN m_wbs_tree b on a.parent_id=b.id INNER JOIN m_element_formula_mapping c on b.id=c.node_id where  a.p_key_id=" + id + " and c.scope="+scopeB+" and c.element_id in(" + elementIds + ")";
+            }
+            List<Long> longs2 = this.jdbcTemplate.queryForList(sql, Long.class);
             wbsFormElements.forEach(e -> {
                 e.setIsSaveFormula(longs2.contains(e.getId()) ? 1 : 0);
             });