|
|
@@ -40,6 +40,7 @@ public class DoaService {
|
|
|
/** 周起始:周一 */
|
|
|
private static Date weekStart(Date date) {
|
|
|
Calendar cal = Calendar.getInstance();
|
|
|
+ cal.setFirstDayOfWeek(Calendar.MONDAY);
|
|
|
cal.setTime(date);
|
|
|
cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
|
|
|
cal.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
@@ -94,12 +95,12 @@ public class DoaService {
|
|
|
return Result.error("目标成员不属于当前家庭");
|
|
|
}
|
|
|
|
|
|
- // 代管校验:memberId != 当前成员 时,目标成员必须是不能登录成员(userId 为空)
|
|
|
+ // 代管校验:memberId != 当前成员 时,目标成员必须是不能登录成员(userId 为空);
|
|
|
+ // selfMemberId 为 null(调用者在家庭下无成员身份)也视为非本人,不可代管可登录成员
|
|
|
Long selfMemberId = resolveMemberIdByUserId(creatorUserId, familyId);
|
|
|
- if (selfMemberId != null && !selfMemberId.equals(memberId)) {
|
|
|
- if (targetMember.getUserId() != null) {
|
|
|
- return Result.error("只能代管不能登录成员的目标");
|
|
|
- }
|
|
|
+ boolean isSelf = selfMemberId != null && selfMemberId.equals(memberId);
|
|
|
+ if (!isSelf && targetMember.getUserId() != null) {
|
|
|
+ return Result.error("只能代管不能登录成员的目标");
|
|
|
}
|
|
|
|
|
|
// 校验目标领域与去重
|