admin登录问题

bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java

@@ -63,11 +63,9 @@ public class TokenService {
      */
     public Map<String, Object> createToken(LoginUser loginUser) {
         // 检查并删除已有的token
-        if (!isWindows() && "admin".equals(loginUser.getSysUser().getUserName())) {
+        if (!isWindows() || !"admin".equals(loginUser.getSysUser().getUserName())) {
             delExistingToken(loginUser.getSysUser().getUserId());
         }
-
-
         String token = IdUtils.fastUUID();
         Long userId = loginUser.getSysUser().getUserId();
         String userName = loginUser.getSysUser().getUserName();

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml

@@ -133,7 +133,7 @@
       bsc.sub_contract_code,
       bsc.sub_contract_name,
       bsc.sub_ein_status,
-      count(bwem.worker_id) as einNum,
+      count(DISTINCT bwem.worker_id) as einNum,
       count(DISTINCT bwer.worker_id) as einNumHis,
       bsc.sub_ein_time,
       bsc.sub_exit_time
@@ -286,8 +286,8 @@
     bap.team_id,
     bap.team_name,
     bwepr.post_name,
-    count(bap.worker_id) AS attNumHis,
+    count(DISTINCT bap.id) AS attNumHis,
-    sum(IF(bap.is_repair = 1, 1, 0)) AS repairNumHis
+    count(DISTINCT IF(bap.is_repair = 1, bap.id, null)) AS repairNumHis
     FROM
     bm_att_person bap
     INNER JOIN pm_worker pw ON pw.id = bap.worker_id

bonus-modules/bonus-job/src/main/java/com/bonus/job/task/ThreeTableOneRosterTask.java

@@ -270,10 +270,8 @@ public class ThreeTableOneRosterTask {
                     Integer id =mapper.getProMonthDataByTable(attProMonthPo);
                     if(id!=null && id>0){
                         attProMonthPo.setId(id);
-                        attProMonthPo.setStatus(1);
                         mapper.updateProMonthData(attProMonthPo);
                     }else{
-                        attProMonthPo.setStatus(1);
                         mapper.insertProMonthData(attProMonthPo);
                     }
                     mapper.updateMonthId(attProMonthPo);

bonus-modules/bonus-job/src/main/resources/mapper/job/WorkerJobMapper.xml

@@ -333,7 +333,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<update id="updateProMonthData">
 		update tb_pro_month_table set roster_num=#{rosterNum},attendance_num=#{attendanceNum},repair_num=#{repairNum},salary_num=#{salaryNum},
-		sub_num=#{subNum},team_num=#{teamNum},gross_salary=#{grossSalary},net_salary=#{netSalary},pay_num=#{payNum},status = #{status}
+		sub_num=#{subNum},team_num=#{teamNum},gross_salary=#{grossSalary},net_salary=#{netSalary},pay_num=#{payNum}
+		<if test="status != null and status != ''">
+			,status = #{status}
+		</if>
 		where pro_id=#{proId} and table_month=#{month}
 	</update>
 

bonus-modules/bonus-system/src/main/resources/mapper/system/SysIpWhitelistMapper.xml

@@ -23,13 +23,14 @@
 
     <select id="selectSysIpWhitelistList" parameterType="com.bonus.system.domain.SysIpWhitelist" resultMap="SysIpWhitelistResult">
         <include refid="selectSysIpWhitelistVo"/>
-        where 1=1
+        <where>
             <if test="ipAddress != null  and ipAddress != ''"> and (
                 ip_address = #{ipAddress}
                 or (INET_ATON(ip_range_start) &lt;= INET_ATON(#{ipAddress})
                 AND INET_ATON(#{ipAddress}) &lt;= INET_ATON(ip_range_end))
                 )
              </if>
+        </where>
         order by created_at desc
     </select>