bug修复，需求优化

modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/dto/AggCarbon.java

@@ -65,7 +65,7 @@ public class AggCarbon {
     }
 
     public BigDecimal getUsageAvg() {
-        return usageAvg == null ? null : usageAvg.setScale(2, RoundingMode.HALF_UP);
+        return usageAvg == null ? null : usageAvg.setScale(3, RoundingMode.HALF_UP);
     }
 
     public BigDecimal getCarbonAvg() {
@@ -210,7 +210,7 @@ public class AggCarbon {
         if (Objects.isNull(value)) {
             return null;
         }
-        return value.divide(count, 2, RoundingMode.HALF_UP);
+        return value.divide(count, 3, RoundingMode.HALF_UP);
     }
 
     private AggCarbon add(AggCarbon other){

modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/dto/MptDetail.java

@@ -65,8 +65,8 @@ public class MptDetail {
     public MptDetail add(MptDetail other) {
         if (Objects.equals(getMaterialCode(), other.getMaterialCode())) {
             setDosage(AggUtil.sum(totalDosage(), other.totalDosage()));
-            setAcquireCarbon(AggUtil.sum(getAcquireCarbon(), other.getAcquireCarbon()));
-            setTransportUse(AggUtil.sum(getTransportUse(), other.getTransportUse()));
+            setAcquireCarbon(other.getAcquireCarbon().multiply(getDosage()));
+            setTransportUse(other.getTransportUse().multiply(getDosage()));
         }
         return this;
     }

modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/service/impl/IotCarbonProductionResultServiceImpl.java

@@ -203,6 +203,7 @@ public class IotCarbonProductionResultServiceImpl
             }
             List<MptDetail> details = JSONArray.parseArray(detailJson, MptDetail.class);
             details.forEach(e -> e.setNum(item.getFinalNum()));
+
             detailList.addAll(details);
         }
 

modules/thing/src/main/java/com/thing/sys/tenant/service/impl/SysTenantDetailServiceImpl.java

@@ -694,6 +694,7 @@ public class SysTenantDetailServiceImpl extends BaseServiceImpl<SysTenantDetailM
         userEntity.setMobile(tenantUser.getPhone());
         userEntity.setTenantCode(tenantCode);
         userEntity.setDeptId(tenantCode);
+        userEntity.setUrl("overview/cgcc");
         return userEntity;
     }
 

modules/thing/src/main/resources/mapper/sys/SysMenuMapper.xml

@@ -52,7 +52,7 @@
 	</select>
 
 	<select id="getSuperAdminMenuList" resultType="com.thing.sys.biz.entity.SysMenuEntity">
-		select t1.*, (select lang.field_value from sys_language lang where lang.table_name='sys_menu' and lang.field_name='name'
+		select DISTINCT t1.*, (select lang.field_value from sys_language lang where lang.table_name='sys_menu' and lang.field_name='name'
 		and lang.table_id=t1.id and lang.language=#{language}) as name
 		from sys_menu t1
 		where t1.sa_view = 1
@@ -70,7 +70,7 @@
 
 
 	<select id="getUserMenuList" resultType="com.thing.sys.biz.entity.SysMenuEntity">
-		select t3.*, (select lang.field_value from sys_language lang where lang.table_name='sys_menu' and lang.field_name='name'
+		select distinct t3.*, (select lang.field_value from sys_language lang where lang.table_name='sys_menu' and lang.field_name='name'
 		and lang.table_id=t3.id and lang.language=#{language}) as name from sys_role_user t1
 		inner join sys_role_menu t2 on t1.role_id = t2.role_id
 		inner join sys_menu t3 on t2.menu_id = t3.id