fix: 87662 外来标准、企标--列表刷新提示非法参数
This commit is contained in:
@@ -32,7 +32,6 @@ import javax.annotation.Resource;
|
|||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
|
|
||||||
@@ -99,7 +98,7 @@ public class LawsTagController extends JeroController<LawsTag, ILawsTagService>
|
|||||||
if(!existCgformTagList.isEmpty()){
|
if(!existCgformTagList.isEmpty()){
|
||||||
LawsTag lawsTagDB = existCgformTagList.get(0);
|
LawsTag lawsTagDB = existCgformTagList.get(0);
|
||||||
//存在重复同名标签,且已删
|
//存在重复同名标签,且已删
|
||||||
if(lawsTagDB.getDelFlag() == CommonConstant.DEL_FLAG_1){
|
if(Objects.equals(lawsTagDB.getDelFlag(), CommonConstant.DEL_FLAG_1)){
|
||||||
//判断属性类型是否一样
|
//判断属性类型是否一样
|
||||||
if (lawsTagDB.getFieldShowType().equals(lawsTag.getFieldShowType())){
|
if (lawsTagDB.getFieldShowType().equals(lawsTag.getFieldShowType())){
|
||||||
//属性类型一样,恢复
|
//属性类型一样,恢复
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
@@ -39,6 +40,7 @@ import java.util.List;
|
|||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
|
@Transactional(rollbackFor = JeroBootException.class)
|
||||||
public class ILawsTagServiceImpl extends ServiceImpl<LawsTagMapper, LawsTag> implements ILawsTagService {
|
public class ILawsTagServiceImpl extends ServiceImpl<LawsTagMapper, LawsTag> implements ILawsTagService {
|
||||||
@Resource
|
@Resource
|
||||||
private LawsTagMapper lawsTagMapper;
|
private LawsTagMapper lawsTagMapper;
|
||||||
|
|||||||
Reference in New Issue
Block a user