Просмотр исходного кода

[审批][修改][去掉原来权限]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
c9c687e94c
3 измененных файлов: 9 добавлений и 7 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java
  2. +6
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  3. +2
    -2
      mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml

+ 1
- 1
mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java Просмотреть файл

@@ -6,7 +6,7 @@ package com.iformall.enums;
public enum EnumTaskType {


NORMAL(1, "正常"),
NORMAL(1, "普通"),
AND(2, "会签"),
OR(3,"或签"),
;


+ 6
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java Просмотреть файл

@@ -86,8 +86,6 @@ public class WxFlowServiceImpl implements WxFlowService {
@Autowired
private MqBaseProducer mqBaseProducer;
@Autowired
private WxBillActionService wxBillActionService;
@Autowired
private WxBillPropertyDepositMapper wxBillPropertyDepositMapper;
@Autowired
private WxBillDepositMapper wxBillDepositMapper;
@@ -1201,10 +1199,10 @@ public class WxFlowServiceImpl implements WxFlowService {
}
}

//部署
BpmnModel bpmnModel = new BpmnModel();
bpmnModel.addProcess(process);
DeploymentBuilder deploymentBuilder = repositoryService.createDeployment().addBpmnModel(process.getId()+".bpmn20.xml", bpmnModel);
//部署
deploymentBuilder.deploy();

wxFlowModel.setFlowId(process.getId());
@@ -1220,6 +1218,11 @@ public class WxFlowServiceImpl implements WxFlowService {
return new ResultData();
}

/**
* 创建连接线
* @param size
* @return
*/
public List<SequenceFlow> createFlow(int size){
List<SequenceFlow> result = new ArrayList<>();
for (int i = 0; i < size+1; i++) {
@@ -1278,7 +1281,6 @@ public class WxFlowServiceImpl implements WxFlowService {
return new ResultData(Result.ERROR, "该流程模板在使用中,须先停用正在\n" +
"使用该模板的审批类型。");
}

wxFlowModelMapper.deleteByPrimaryKey(wxFlowModel.getId());
return new ResultData();
}


+ 2
- 2
mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml Просмотреть файл

@@ -275,12 +275,12 @@
</resultMap>

<sql id="allSafeVColumns">
u.`id`,u.`tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`nick_name`,u.`phone`,u.`flow_permission`,
u.`id`,u.`tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`nick_name`,u.`phone`,
m.`name` as mall_name, m.`group` as mall_group, m.`img_url`, m.`img_url_h`,email
</sql>

<sql id="allVColumns">
u.`id`,u.`tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`nick_name`,u.`phone`,u.`flow_permission`,
u.`id`,u.`tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`nick_name`,u.`phone`,
u.`bopen_id`,u.`web_open_id`,
m.`name` as mall_name, m.`group` as mall_group, m.`img_url`, m.`img_url_h`,email
</sql>


Загрузка…
Отмена
Сохранить