资源唯一校验调整为key+languageCode+softType

yun-zuoyi
汪云昊 5 years ago
parent 243c38793b
commit f7d6192794

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.platform.bean; package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
@ -30,6 +29,7 @@ import javax.persistence.Table;
public class SysTask extends BaseBean { public class SysTask extends BaseBean {
private static final long serialVersionUID = -4462661508105857312L; private static final long serialVersionUID = -4462661508105857312L;
@Column(name="NAME") @Column(name="NAME")
@ApiParam(value ="名称") @ApiParam(value ="名称")
private String name; private String name;

@ -718,6 +718,7 @@ public class CoreHqlPack {
HqlPack.getStringEqualPack(localeResource.getLanguageCode(),"languageCode",result); HqlPack.getStringEqualPack(localeResource.getLanguageCode(),"languageCode",result);
HqlPack.getStringEqualPack(localeResource.getResourceKey(),"resourceKey",result); HqlPack.getStringEqualPack(localeResource.getResourceKey(),"resourceKey",result);
HqlPack.getNumEqualPack(localeResource.getSoftType(),"softType",result);
HqlPack.getNumNOEqualPack(localeResource.getId(),"id",result); HqlPack.getNumNOEqualPack(localeResource.getId(),"id",result);
// 添加默认排序 // 添加默认排序

Loading…
Cancel
Save