更改bug

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/OrganServiceImpl.java

@@ -1348,7 +1348,7 @@ public class OrganServiceImpl implements IOrganService {
                     vo.setPid("-2");
                 }
                 vo.setLevel(1);
-                vo.setName(StringUtils.isBlank(base.getAccountname()) ? "默认配置" : base.getAccountname());//分组名称
+                vo.setName(StringUtils.isBlank(base.getAccountname()) ? AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM030.getCode(), request.getHeader("Accept-Language")) : base.getAccountname());//分组名称
                 vo.setUserid(base.getUserid());
                 vo.setTradetype(base.getTradetype());
                 result.add(vo);

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/UseraccountServiceImpl.java

@@ -1193,7 +1193,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
         defaultVO.setId("z0");
         defaultVO.setPid("-1");
         defaultVO.setLevel(1);
-        defaultVO.setName("默认配置");
+        defaultVO.setName(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM030.getCode(), request.getHeader("Accept-Language")));
         defaultVO.setUsergroupid(0L);
         result.add(defaultVO);
 
@@ -1626,7 +1626,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                     vo.setPid("-2");
                 }
                 vo.setLevel(1);
-                vo.setName(StringUtils.isBlank(base.getAccountname()) ? "默认配置" : base.getAccountname());//分组名称
+                vo.setName(StringUtils.isBlank(base.getAccountname()) ? AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM030.getCode(), request.getHeader("Accept-Language")) : base.getAccountname());//分组名称
                 vo.setUserid(base.getUserid());
                 vo.setTradetype(base.getTradetype());
                 result.add(vo);

mtp3-century/src/main/resources/mapper/GoodsMapper.xml

@@ -69,8 +69,10 @@
     </sql>
     <select id="queryGoodsSelect" resultType="com.muchinfo.mtp3pojos.vo.common.GoodsSelectResult">
         select g.goodsid as goodsId, g.goodscode as goodsCode, g.goodsname as goodsName , g.goodunitid
+        ,gex.goodsnameth ,gex.goodsnameen ,gex.goodsnametw ,gex.goodsnamevi
         from goods g
         left join market m on g.marketid = m.marketid
+        left join goodsex gex on g.goodsid = gex.goodsid
         <where>
             1 = 1
             <if test="split!=null and split.length>0">

mtp3-century/src/main/resources/message_en.properties

@@ -27,6 +27,7 @@ message_code_system027=There is still {0} chance of error left, Account or passw
 message_code_system028=This document is already on the blacklist!
 message_code_system029=The IP address cannot be a null value!
 message_code_system030=IP address duplication!
+message_code_system031=default configuration
 message_error_code_system001=Token invalid, please log in again!
 message_error_code_system002=operation failed
 message_error_code_system003=The user does not have operational permissions

mtp3-century/src/main/resources/message_th.properties

@@ -27,6 +27,7 @@ message_code_system027=\u0E40\u0E2B\u0E25\u0E37\u0E2D\u0E42\u0E2D\u0E01\u0E32\u0
 message_code_system028=\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E14\u0E33\u0E21\u0E35\u0E40\u0E2D\u0E01\u0E2A\u0E32\u0E23\u0E19\u0E35\u0E49\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27!
 message_code_system029=\u0E17\u0E35\u0E48\u0E2D\u0E22\u0E39\u0E48 IP \u0E15\u0E49\u0E2D\u0E07\u0E44\u0E21\u0E48\u0E21\u0E35\u0E04\u0E48\u0E32\u0E27\u0E48\u0E32\u0E07!
 message_code_system030=\u0E17\u0E35\u0E48\u0E2D\u0E22\u0E39\u0E48 IP \u0E0B\u0E49\u0E33\u0E01\u0E31\u0E19!
+message_code_system031=\u0E01\u0E32\u0E23\u0E01\u0E33\u0E2B\u0E19\u0E14\u0E04\u0E48\u0E32\u0E1B\u0E23\u0E34\u0E22\u0E32\u0E22
 message_error_code_system001=\u0E42\u0E17\u0E40\u0E04\u0E47\u0E19\u0E25\u0E49\u0E21\u0E40\u0E2B\u0E25\u0E27\u0E42\u0E1B\u0E23\u0E14\u0E40\u0E02\u0E49\u0E32\u0E2A\u0E39\u0E48\u0E23\u0E30\u0E1A\u0E1A\u0E2D\u0E35\u0E01\u0E04\u0E23\u0E31\u0E49\u0E07!
 message_error_code_system002=\u0E01\u0E32\u0E23\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E01\u0E32\u0E23\u0E25\u0E49\u0E21\u0E40\u0E2B\u0E25\u0E27!
 message_error_code_system003=\u0E44\u0E21\u0E48\u0E21\u0E35\u0E2A\u0E34\u0E17\u0E18\u0E34\u0E4C\u0E43\u0E19\u0E01\u0E32\u0E23\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E07\u0E32\u0E19\u0E02\u0E2D\u0E07\u0E1C\u0E39\u0E49\u0E43\u0E0A\u0E49\u0E23\u0E32\u0E22\u0E19\u0E35\u0E49!

mtp3-century/src/main/resources/message_vi.properties

@@ -27,6 +27,7 @@ message_code_system027=C\u00F2n {0} c\u01A1 h\u1ED9i l\u1ED7i, t\u00E0i kho\u1EA
 message_code_system028=Danh s\u00E1ch \u0111en \u0111\u00E3 c\u00F3 gi\u1EA5y t\u1EDD n\u00E0y!
 message_code_system029=\u0110\u1ECBa ch\u1EC9 IP kh\u00F4ng th\u1EC3 l\u00E0 null!
 message_code_system030=\u0110\u1ECBa ch\u1EC9 IP l\u1EB7p l\u1EA1i!
+message_code_system031=C\u1EA5u h\u00ECnh m\u1EB7c \u0111\u1ECBnh
 message_error_code_system001=M\u00E3 th\u00F4ng b\u00E1o h\u1EBFt hi\u1EC7u l\u1EF1c, xin vui l\u00F2ng \u0111\u0103ng nh\u1EADp l\u1EA1i!
 message_error_code_system002=Ho\u1EA1t \u0111\u1ED9ng th\u1EA5t b\u1EA1i
 message_error_code_system003=Kh\u00F4ng c\u00F3 quy\u1EC1n h\u00E0nh \u0111\u1ED9ng cho ng\u01B0\u1EDDi d\u00F9ng \u0111\u00F3!

mtp3-century/src/main/resources/message_zh-cn.properties

@@ -27,6 +27,7 @@ message_code_system027=\u8FD8\u5269{0}\u6B21\u9519\u8BEF\u673A\u4F1A,\u8D26\u53F
 message_code_system028=\u9ED1\u540D\u5355\u5DF2\u6709\u6B64\u8BC1\u4EF6!
 message_code_system029=IP\u5730\u5740\u4E0D\u80FD\u4E3A\u7A7A\u503C!
 message_code_system030=IP\u5730\u5740\u91CD\u590D!
+message_code_system031=\u9ED8\u8BA4\u914D\u7F6E
 message_error_code_system001=\u4EE4\u724C\u5931\u6548\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\uFF01
 message_error_code_system002=\u64CD\u4F5C\u5931\u8D25
 message_error_code_system003=\u6CA1\u6709\u8BE5\u7528\u6237\u7684\u64CD\u4F5C\u6743\u9650!

mtp3-century/src/main/resources/message_zh-hk.properties

@@ -27,6 +27,7 @@ message_code_system027=\u9084\u5269{0}\u6B21\u932F\u8AA4\u6A5F\u6703\uFF0C\u5E33
 message_code_system028=\u9ED1\u540D\u55AE\u5DF2\u6709\u6B64\u8B49\u4EF6!
 message_code_system029=IP\u5730\u5740\u4E0D\u80FD\u70BA\u7A7A\u503C!
 message_code_system030=IP\u5730\u5740\u91CD\u8907!
+message_code_system031=\u9ED8\u8A8D\u914D\u5BD8
 message_error_code_system001=\u6B0A\u6756\u5931\u6548\uFF0C\u8ACB\u91CD\u65B0\u767B\u5165\uFF01
 message_error_code_system002=\u64CD\u4F5C\u5931\u6557
 message_error_code_system003=\u6C92\u6709\u8A72\u7528\u6236\u7684\u64CD\u4F5C\u8A31\u53EF\u6B0A\uFF01

mtp3-century/src/main/resources/message_zh-tw.properties

@@ -27,6 +27,7 @@ message_code_system027=\u9084\u5269{0}\u6B21\u932F\u8AA4\u6A5F\u6703\uFF0C\u5E33
 message_code_system028=\u9ED1\u540D\u55AE\u5DF2\u6709\u6B64\u8B49\u4EF6!
 message_code_system029=IP\u5730\u5740\u4E0D\u80FD\u70BA\u7A7A\u503C!
 message_code_system030=IP\u5730\u5740\u91CD\u8907!
+message_code_system031=\u9ED8\u8A8D\u914D\u5BD8
 message_error_code_system001=\u6B0A\u6756\u5931\u6548\uFF0C\u8ACB\u91CD\u65B0\u767B\u5165\uFF01
 message_error_code_system002=\u64CD\u4F5C\u5931\u6557
 message_error_code_system003=\u6C92\u6709\u8A72\u7528\u6236\u7684\u64CD\u4F5C\u8A31\u53EF\u6B0A\uFF01

mtp3-common/src/main/java/com/muchinfo/mtp3common/enumtype/MessageType.java

@@ -34,6 +34,7 @@ public enum MessageType {
     MESSAGE_CODE_SYSTEM028("message_code_system028", "黑名单已有此证件"),
     MESSAGE_CODE_SYSTEM029("message_code_system029", "IP地址不能为空值"),
     MESSAGE_CODE_SYSTEM030("message_code_system030", "IP地址重复"),
+    MESSAGE_CODE_SYSTEM031("message_code_system031", "默认配置"),
 
     MESSAGE_ERROR_CODE_SYSTEM001("message_error_code_system001", "令牌失效，请重新登录！"),
     MESSAGE_ERROR_CODE_SYSTEM002("message_error_code_system002", "操作失败"),

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/common/GoodsSelectResult.java

@@ -24,4 +24,12 @@ public class GoodsSelectResult {
     private String goodsName;
 
     private Long goodunitid;
+
+    private String goodsnameth;
+
+    private String goodsnameen;
+
+    private String goodsnametw;
+
+    private String goodsnamevi;
 }