gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复APP特征配置导入bug

Browse Source 
Conflicts:
	src/main/java/com/nis/web/controller/BaseController.java
This commit is contained in:
zhangwenqing
2019-01-26 11:56:10 +08:00
committed by wangxin
parent 6931832c8c
commit 90ffb5388f
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -2109,6 +2109,7 @@ public abstract class BaseService {
long start=System.currentTimeMillis();
ConfigGroupInfo configGroupInfo=configGroupInfoDao.getConfigGroupInfoByGroupId(specificServiceCfg.getGroupId());
if(configGroupInfo==null) {//一般特定服务的组号是新增之后就有的，不会进入这一步。
Date date = new Date();
Integer groupId = ConfigServiceUtil.getId(2, 1).get(0);
Integer compileId=ConfigServiceUtil.getId(1, 1).get(0);
specificServiceCfg.setGroupId(groupId);
@@ -2118,9 +2119,10 @@ public abstract class BaseService {
configGroupInfo.setIsIssued(0);
configGroupInfo.setGroupType(1);
configGroupInfo.setCompileId(compileId);
configGroupInfo.setInsertTime(date);
configGroupInfoDao.insertConfigGroupInfo(configGroupInfo);
//更新group_id
specificServiceCfg.setOpTime(new Date());
specificServiceCfg.setOpTime(date);
specificServiceCfgDao.update(specificServiceCfg);
}
Integer compileId = configGroupInfo.getCompileId();