重新生成工时表

xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java

@@ -92,6 +92,8 @@ public class XmGroupUserController {
 		Map<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmGroupUser, "ids");
 		PageUtils.startPage(xmGroupUser);
+		User user=LoginUtils.getCurrentUserInfo();
+		xmGroupUser.put("branchId",user.getBranchId());
 		List<Map<String,Object>>	xmGroupUserList = xmGroupUserService.selectListMapByWhere(xmGroupUser);	//列出XmProjectGroupUser列表
 		PageUtils.responePage(m, xmGroupUserList);
 		m.put("data",xmGroupUserList);

xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java

@@ -107,7 +107,11 @@ public class XmIterationController {
 		xmIteration.put("userid",user.getUserid());
 		if(  !( StringUtils.hasText(branchId)|| StringUtils.hasText(id) || StringUtils.hasText(productId)|| StringUtils.hasText(menuId)||ids!=null
 				|| StringUtils.hasText(adminUserid) ) ){
-			xmIteration.put("compete",user.getUserid());
+			if(LoginUtils.isBranchAdmin()){
+				xmIteration.put("branchId",user.getBranchId());
+			}else{
+				xmIteration.put("compete",user.getUserid());
+			}
 		}
 		if("branchId".equals(queryScope)){
 			xmIteration.put("branchId",user.getBranchId());
@@ -141,7 +145,11 @@ public class XmIterationController {
 		xmIteration.put("userid",user.getUserid());
 		if(  !(StringUtils.hasText(branchId)|| StringUtils.hasText(id) || StringUtils.hasText(productId)|| StringUtils.hasText(menuId)||ids!=null
 				|| StringUtils.hasText(adminUserid) ) ){
-			xmIteration.put("compete",user.getUserid());
+			if(LoginUtils.isBranchAdmin()){
+				xmIteration.put("branchId",user.getBranchId());
+			}else{
+				xmIteration.put("compete",user.getUserid());
+			}
 		}
 		if("branchId".equals(queryScope)){
 			xmIteration.put("branchId",user.getBranchId());

xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java

@@ -103,7 +103,12 @@ public class XmProductController {
 		xmProduct.put("userid",user.getUserid());
 		if( !StringUtils.hasText(queryScope) && !(StringUtils.hasText(id) || StringUtils.hasText(projectId)|| StringUtils.hasText(pmUserid)||ids!=null
 				 ||ids!=null ) ){
-			xmProduct.put("compete",user.getUserid());
+			if(LoginUtils.isBranchAdmin()){
+				xmProduct.put("branchId",user.getBranchId());
+			}else{
+				xmProduct.put("compete",user.getUserid());
+			}
+
 		}
 		if(!StringUtils.hasText((String) xmProduct.get("isTpl"))){
 			xmProduct.put("isTpl","0");
@@ -153,7 +158,11 @@ public class XmProductController {
 		xmProduct.put("userid",user.getUserid());
 		if( !StringUtils.hasText(queryScope) && !(StringUtils.hasText(id) || StringUtils.hasText(projectId)|| StringUtils.hasText(pmUserid)||ids!=null
 				||ids!=null ) ){
-			xmProduct.put("compete",user.getUserid());
+			if(LoginUtils.isBranchAdmin()){
+				xmProduct.put("branchId",user.getBranchId());
+			}else{
+				xmProduct.put("compete",user.getUserid());
+			}
 		}
 		if(!StringUtils.hasText((String) xmProduct.get("isTpl"))){
 			xmProduct.put("isTpl","0");

xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java

@@ -111,8 +111,12 @@ public class XmProjectController {
 		xmProject.put("userid",user.getUserid());
 		if( !(StringUtils.hasText(id) || StringUtils.hasText(myFocus)|| StringUtils.hasText(productId)||ids!=null
 				|| StringUtils.hasText(myExecuserStatus)||pgTypeIds!=null|| StringUtils.hasText(createUserid)) ){
+			if(LoginUtils.isBranchAdmin()){
+				xmProject.put("branchId",user.getBranchId());
+			}else {
+				xmProject.put("compete",user.getUserid());
+			}
 
-			xmProject.put("compete",user.getUserid());
 		}
 		if(!StringUtils.hasText((String) xmProject.get("isTpl"))){
 			xmProject.put("isTpl","0");

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupUserMapper.xml

@@ -11,7 +11,9 @@
                 ( #{item.groupId},  #{item.userid})
              </foreach>
          </if>
-
+		<if test="branchId!=null and branchId!=''">
+			and (g.branch_id=#{branchId} or g.crow_branch_id=#{branchId})
+		</if>
 		<if test="groupNameKey != null and groupNameKey !='' ">    and g.group_name like concat('%',#{groupNameKey},'%')   </if>
 		<if test="mngUsernamekey != null and mngUsernamekey !='' ">    and (g.leader_username like concat('%',#{mngUsernamekey},'%') or g.ass_username like  concat('%',#{mngUsernamekey},'%'))  </if>
 		<if test="groupUsernameKey != null and groupUsernameKey !='' ">    and res.username like concat('%',#{groupUsernameKey},'%') </if>