wuxw %!s(int64=2) %!d(string=hai) anos
pai
achega
0c182287cd

+ 2 - 2
java110-db/src/main/resources/mapper/user/UserV1ServiceDaoImplMapper.xml

@@ -162,10 +162,10 @@
         select count(DISTINCT t.user_id) count
         from u_user t
         inner join s_store_user su on t.user_id = su.user_id and su.status_cd = '0'
-        LEFT JOIN u_org_staff_rel osr on su.user_id = osr.staff_id and osr.status_cd = '0'
+        LEFT JOIN u_org_staff_rel osr on su.user_id = osr.staff_id and osr.status_cd = '0'  and osr.org_id = #{orgId}
         where t.level_cd = '01'
         and su.store_id = #{storeId}
-        and (osr.org_id != #{orgId} or osr.org_id is null)
+        and  osr.org_id is null
         <if test="staffName !=null and staffName != ''">
             and t.name like concat('%', #{staffName},'%')
         </if>

+ 0 - 2
service-acct/src/main/java/com/java110/acct/cmd/payment/CashierCmd.java

@@ -8,8 +8,6 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.log.LoggerFactory;
-import com.java110.doc.annotation.*;
-import com.java110.dto.fee.FeeDto;
 import com.java110.dto.fee.PayFeeDto;
 import com.java110.dto.payment.PaymentOrderDto;
 import com.java110.dto.paymentPool.PaymentPoolDto;