update:基础模块bug修改

laws-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java

@@ -86,7 +86,7 @@ public class SysDictItem {
     @TableField(value = "`status`")
     @Dict(dicCode = "dict_item_status")
     @ApiModelProperty(value = "状态（1启用 0不启用）")
-    @Excel(name = "是否启用", width = 15, dicCode = "dict_item_status")
+    @Excel(name = "是否启用（启用/不启用）", width = 15, dicCode = "dict_item_status")
     private Integer status;
 
     /**

laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysGroupMapper.xml

@@ -10,7 +10,7 @@
             sg.create_time,
             count(sug.id) as count,
             GROUP_CONCAT(sug.user_id) as ids,
-            GROUP_CONCAT(CONCAT(su.realname, '(', su.username, ')')) as userNames
+        GROUP_CONCAT(CONCAT(su.realname, '(', su.username, ')') ORDER BY su.realname, su.username) as userNames
         from sys_group sg
                  LEFT JOIN sys_user_group sug on sg.id = sug.group_id
                  LEFT JOIN sys_user su on sug.user_id = su.id

laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java

@@ -236,7 +236,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 			if (sysDictItemList != null) {
 				for (SysDictItem entity : sysDictItemList) {
 					entity.setDictId(sysDict.getId());
-					entity.setStatus(1);
+					if (entity.getStatus() == null) {
+						entity.setStatus(1);
+					}
 					entity.setIsReadOnly(0);
 					entity.setIsTagDict(0);
 					sysDictItemMapper.insert(entity);