Merge remote-tracking branch 'origin/dev' into dev

pz-system/src/main/resources/mapper/merchant/EmployeesMapper.xml

@@ -45,16 +45,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectEmployeesInfoById" resultType="com.pz.merchant.domain.vo.TodayOrderListVo">
         select employees.id as emId,
-               employees.name,
-               employees.working_hours,
-               employees.status,
-               year(current_date) - ifnull(employees.start_year, 0) as workYear,
-               employees.now_type,
-               user.avatar,
-               concat(round((sum(if(total_order.is_satisfaction = 1, 1, 0)) / count(total_order.id)) * 100, 2), '%') as favorableRate
+        employees.name,
+        employees.working_hours,
+        employees.status,
+        year(current_date) - ifnull(employees.start_year, 0) as workYear,
+        employees.now_type,
+        user.avatar,
+        concat(ifnull(round((sum(if(total_order.is_satisfaction = 1, 1, 0)) / count(total_order.id)) * 100, 2),0), '%')
+        as favorableRate
         from employees
-                 left join sys_user as user on user.user_id = employees.uid
-                 left join total_order on total_order.em_id = employees.id and total_order.business_id != 0
+        left join sys_user as user on user.user_id = employees.uid
+        left join total_order on total_order.em_id = employees.id and total_order.business_id != 0
         <where>
             <if test="id != null and id > 0">
                 employees.id = #{id}
@@ -69,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         e.name,
         e.start_year,
         e.working_hours,
-        concat(round((sum(if(o.is_satisfaction = 1, 1, 0)) / count(o.id)) * 100, 2)) AS satisfaction_rate
+        ifnull(round((sum(if(o.is_satisfaction = 1, 1, 0)) / count(o.id)) * 100, 2), 0) AS satisfaction_rate
         FROM employees e
         left join total_order o on o.em_id = e.id
         left join company c on c.id = e.company_id
@@ -104,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                s.avatar,
                e.name,
                e.working_hours,
-               concat(round((sum(if(o.is_satisfaction = 1, 1, 0)) / count(o.id)) * 100, 2)) AS satisfaction_rate
+               ifnull(round((sum(if(o.is_satisfaction = 1, 1, 0)) / count(o.id)) * 100, 2), 0) AS satisfaction_rate
         FROM employees e
                  INNER join total_order o on o.em_id = e.id
                  left join company c on c.id = e.company_id