1.管理人树形调整

src/main/java/com/ydtech/modules/admin/dao/SysUserMapper.java

@@ -520,6 +520,9 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
 
     AppUserInfoVo queryByUserId(@Param("userId")String userId);
+
+    List<SysUser> selectByParamsTreeUser(HashMap<String, Object> params);
+
 }
 
 

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -2268,7 +2268,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public List<SysUser> getTreeUser() {
         HashMap<String, Object> params = new HashMap<>();
-        List<SysUser> users = sysUserMapper.selectByParams(params);
+        List<SysUser> users = sysUserMapper.selectByParamsTreeUser(params);
         if (users == null || users.isEmpty()) {
             return new ArrayList<>();
         }

src/main/java/com/ydtech/modules/admin/service/impl/TaskStatisticsServiceImpl.java

@@ -864,7 +864,7 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
         if(ObjectUtils.isNotEmpty(sumPremium)){
             BigDecimal sumPremium1 = allsumPremium.getSumPremium();
             if(sumPremium.compareTo(BigDecimal.ZERO) ==1){
-                BigDecimal multiply = sumPremium.divide(sumPremium1, 2, BigDecimal.ROUND_DOWN);
+                BigDecimal multiply = sumPremium.divide(sumPremium1, 4, BigDecimal.ROUND_DOWN);
                 result.setSumPremiumProportion(multiply);
             }
         }else {

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -1993,6 +1993,20 @@
         </where>
     </select>
 
+
+    <select id="selectByParamsTreeUser" resultType="com.ydtech.modules.admin.model.SysUser">
+        select * from sys_user su
+        left join sys_dept sd on sd.id =su.dept_id
+        <where>
+            su.leader_id is not null
+            AND su.id not LIKE '%M%'
+            AND su.status  ='1'
+             <if test="leaderId !=null and  leaderId !=''">
+               and  su.leader_id =#{leaderId}
+             </if>
+        </where>
+    </select>
+
     <select id="getGroupByUserId" resultType="java.lang.String">
         select id from  sys_user  where (manager_id = #{userId}  or id = #{userId}  )
     </select>