Fixed user and system queries for profiles

skavanagh · skavanagh · commit 57784d86410d · 2017-03-18T13:27:18.000-04:00
Fixed user and system queries for setting profiles
diff --git a/src/main/java/com/keybox/manage/db/SystemDB.java b/src/main/java/com/keybox/manage/db/SystemDB.java
@@ -124,12 +124,13 @@ public static SortedSet getSystemSet(SortedSet sortedSet, Long profileId) {
 		if (sortedSet.getOrderByField() != null && !sortedSet.getOrderByField().trim().equals("")) {
 			orderBy = "order by " + sortedSet.getOrderByField() + " " + sortedSet.getOrderByDirection();
 		}
-		String sql = "select s.*, m.profile_id from  system s left join system_map  m on m.system_id = s.id " + orderBy;
+		String sql = "select s.*, m.profile_id from  system s left join system_map  m on m.system_id = s.id and m.profile_id = ? " + orderBy;
 
 		Connection con = null;
 		try {
 			con = DBUtils.getConn();
 			PreparedStatement stmt = con.prepareStatement(sql);
+			stmt.setLong(1, profileId);
 			ResultSet rs = stmt.executeQuery();
 
 			while (rs.next()) {
diff --git a/src/main/java/com/keybox/manage/db/UserDB.java b/src/main/java/com/keybox/manage/db/UserDB.java
@@ -112,12 +112,13 @@ public static SortedSet getAdminUserSet(SortedSet sortedSet, Long profileId) {
         if (sortedSet.getOrderByField() != null && !sortedSet.getOrderByField().trim().equals("")) {
             orderBy = "order by " + sortedSet.getOrderByField() + " " + sortedSet.getOrderByDirection();
         }
-        String sql = " select u.*, m.profile_id from users u left join user_map  m on m.user_id = u.id where u.user_type like '" + User.ADMINISTRATOR + "' " + orderBy;
+        String sql = "select u.*, m.profile_id from users u left join user_map  m on m.user_id = u.id and m.profile_id = ? where u.user_type like '" + User.ADMINISTRATOR + "'" + orderBy;
 
         Connection con = null;
         try {
             con = DBUtils.getConn();
             PreparedStatement stmt = con.prepareStatement(sql);
+            stmt.setLong(1, profileId);
             ResultSet rs = stmt.executeQuery();
             while (rs.next()) {
                 User user = new User();
